Issue #9670: merge with 3.2