Merge branch 'jc/fsck-retire-require-eoh' into maint