Issue #6057: Merge from 3.5