Merge "Added bug fix reported in SonarQube for MusicUtil"