Issue #17521: Merged fix from 3.2.