Merge remote-tracking branch 'origin/feature/6770_curve_colours'
Merge remote-tracking branch 'origin/feature/6809_ClearMaskFlag'
Merge branch 'feature/1234_summat' into develop