Issue #17149: merge fix from 3.2.