Merge fixes for #13614, #13512 and #7719 from 3.2