Merge branch 'develop' into features/JAL-1956_featureStyles