merge 3.5 (#27783)