Issue #14783: Backport changes from 3.2.
9 files changed