Merge with upstream (Fixed bugs #67326 #67410 #67411 #67412 #67413)