Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...