Issue #28489: Merge from 3.6