Merge branch 'ab/fsck-api-cleanup'