Issue #3367: Merge fix from 3.2.