Issue #5622: merge fix from 3.1.