Issue #9501: Merged fix from 3.2.