Merge issue #21669 from 3.4