Bundle update
Merge branch 'bundle_update'