Merge 3.5, fix for #24142