Merged fix for #13361 from 3.2.