Issue #20939: merge from 3.3
2 files changed