#18978 fix. Styles moved
Merge branch 'i18978' into development