Merge branch 'jc/maint-bundle-too-quiet' into maint