Merge with 3.4 for Issue #24729