Merge branch 'improvement/JAL-4014_gecos_colour_schemes' into develop