merge 3.6 (#29085)