Issue #14410: merge with 3.2