Merge 3.2 - update to the fix for #12084