#18978 fix. Styles local added
Merge branch 'i18978' into development