Merge fix for #11560 from 3.2