Issue #28208: Merge with 3.6