Merge branch 'ab/fsck-transfer-updates'