Merge branch 'jc/fsck-nul-in-commit' into maint