Issue #14554: merge with 3.2