fixed Colored + Composed
Merge remote-tracking branch 'origin/develop-MW' into develop-JK
Merge remote-tracking branch 'origin/master' into develop-MW