merge 3.5 (#27773)