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