Issue #10513: Merge from 3.5