Merge 3.5 (Issue #19235)