Issue #14926: merge with 3.2