Merge issue #22711 from 3.4