configure package
create bundle
Merge branch 'develop'