Merge branch 'patch/JAL-4317_enablefeaturewhenadjustingstyle' into develop