Merge "Fix music url issues"