DDBNEXT-995 Refactoring FavoritesController
Merge branch 'DDBNEXT-995-bro' into develop