Merge branch 'jk/rerere-forget-check-enabled' into maint