Merge branch 'lf/bundle-exclusion' into maint