Merge branch 'features/JAL-2371collectionColourScheme' into develop