Issue #23211: merge from 3.4