Merged fix for issue #12168 from 3.2.