Issue #28208: merge from 3.6