Updated bundles
Synced from master
Synced from master