Finish removing separate constrain for WaterLevel reading
Merge branch 'waterlevelfix' into current