Issue #12780: Merged fix from 3.2.