removed use waterfall flag
data is only sent to waterfall if the waterfall is enabled
Merge branch 'bug_fixes' into development