Issue #28306: Merge from 3.6