Merge fixes for #9860, #11104/#8688 and #12331 from 3.2