sync bundle with latest changes in core.