Merge with 3.5 for Issue #24729