merge 3.4 (#27774)