merge 3.4 (#16561)