Merge branch 'develop' into JAL-1640_stylesettings