case 3430 - Custom playlist feeds based by genre.
case 3430 - CR fixes.
Merge branch 'case-3430' into develop
Merge remote-tracking branch 'origin/develop'