Merge branch 'nd/exclusion-regression-fix' into maint