#18962 Slightly changed colors
Merge branch 'i18962' into development