Merge branch 'js/fsck-tag-validation' into HEAD