merge 3.6 (#28898)