Fix: CSS
Merge remote-tracking branch 'origin/3.2' into 3.2_backported