Merged fix for #13211 from 3.2