Merge branch 'as/check-ignore'