Add bundler again
Merge branch 'hotfix/addbundler' into develop