Issue #21187: merge with 3.4