Merge branch 'nd/ignore-then-not-ignore'