Merge fix for #8933 from 3.2