Merged solution for #11858 from 3.2.