Additional changes related to authored styles based on Simon's feedback
(related to issue 5507)