NZ-9 - MusicBrainz Integration: Merge Changes Into music.php