Merge branch 'ap/status-ignored-in-ignored-directory' into maint