Disjoint water supply (#6584) - Basecamp