Issue #13605: merge with 3.2