Merge branch 'hotfix/favorites-index' into 'develop'