Issue #16698: merge from 3.2