Merge issue #21667 from 3.4