Issue #18759: Merged updates from 3.3.