merge 3.2 (#24044)