Issue #15853: merge 3.2 -> 3.3