fix #8541
Merge branch 'jeff/inline-styling' into dangoor/inline-styling