Merge with 3.4 Issue #22628