Merge with upstream
Updated bundles