Issue #11444: Merge fix from 2.6.