Merge changes from GateIn 3.7 for CSS