Merge fix for #24458 from 3.5