Updating latest changes before sync with upstream.