Issue #21279: Merge with 3.4