Issue #20644: merge with 3.4