Issue #28226: Merge from 3.6