Merge pull request #601 from WarnerMusicGroup/DEVP-2930

Devp 2930
Merge pull request #602 from WarnerMusicGroup/DEVP-2930

Devp 2930