Issue #28616: merge from 3.5