Merge branch 'jk/maint-add-ignored-dir' into maint