Merge fix for issue #22166 from 3.4