Issue #21431: merge from 3.4
2 files changed