FLUID-5205, FLUID-5216: Styling fixes
Merge branch 'master' into FLUID-5205
Merge remote-tracking branch 'anastasia/FLUID-5205' into FLUID-5205