Issue #21958: Merge with 3.4