Merge fix for #10946 from 3.2