Issue #22343: Merged change from 3.6.