Issue #14783: Merge changes from 3.3.