Merge fix for #11490 from 3.1.