Merge branch 'cb/fsck-squelch-dangling'