Merge branch 'jc/bundle-complete-notice' into maint