Manual merge from main.css-v4.2.0