Issue #19638: Merge from 3.3