Merge branch 'feature/favorite-refactor' into 'develop'