Merge pull request #4555 from FernetMenta/musicosd