Merge branch 'js/fsck-opt'