Issue #9154: Merge fix from 3.2.