Issue #13439: Merge branch 3.2