Merge issue #24129 from 3.5