Merge branch 'jk/check-corrupt-objects-carefully'