Merge 3.5 (Issue #27041)