Issue #21166: merge from 3.4