Merge branch 'mg/add-ignore-errors' into maint