merge 3.4 (#23364, #23363)