Merge branch 'en/check-ignore' into maint