Merge branch 'ab/report-corrupt-object-with-type'