Merge branch 'ab/fsck-skiplist'