speed refactor on the waterfall
Merge branch 'walport-water' into testing