Issue #28930: Merge from 3.6.