BZ-11843 Updates styles --> Merge from master