Does increasing water intake prevent kidney stones and aid in their treatment?

Does increasing water intake prevent kidney stones and aid in their treatment?