Merge branch 'features/JAL-2360colourSchemeApplicability' into