merge 3.6 (#28081)