Merge 3.5 (Issue #24528)