Issue #18893: Merge from 3.5