Merge branch 'ch/maint-cannot-create-bundle-error'