Merged fix for #15803 from 3.2