Issue #18676: Merge from 3.3