Issue #10197: merge 3.3