sync with latest changes in core.