Issue #17715: Merge fix from 3.3.