0025: fixed sync crash bug
Merge branch 'develop-music' into develop