Merge 3.4 (Issue #24867)