Merge branch 'feature/dz_multicolor' into develop