Issue #14992: merge from 3.2