Merge branch 'new_feature/JAL-4019_ambiguous_base_colourscheme' into develop