merge 3.5 (#26046)