Issue #14696: Merge from 3.2