add the empty waterfall state
Merge branch 'walport-water' into testing