Merge branch 'bugfix/favourites-link-header' into 'develop'