Merge fix for #8887 from 3.2