Issue #28222: Merge from 3.6