Issue #13496: Merge from 3.2