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

Merge 4.3-final.