Merged solution for #12036 from 3.2