Merge fix for #10086 from 3.2