Merge fix for #15230 from 3.2