Another batch of fixes related to colors

Merged Sylvain Berfini requested to merge fix/colors_3 into master

Merge request reports