Merge #6717 crasher from 3.2