Merge "Sonar Fix: MusicDataStore"