Merge /data/l/clean-cg into mini-v4.2

Merge v4.2-final.