Issue 10052: merge fix from 3.2.