Merge branch 'develop' into case-2108
case 2108 - Playlist CT styles.
Merge branch 'case-2108' into develop