fix #31986
fix #34046
fix #33881
Merge branch 'lvinken-musicxml-fixes'