Merge 3.2: Issue #13703 plus some related test suite fixes.