Regression in dev code after reorganizing clips
Mistake in the previous
Dev branch regression on waterfall up color
Changes after regression testing dev branch
Merge remote-tracking branch 'upstream/master'