Upstream favourites update
upstream changes