Issue #20644: merge from 3.4