Merge branch 'release/v2.3.2'
Merge tag 'v2.3.2' into develop

CSS massaging