Merge fixes for #1326113 and #12297 from 3.2