Merge branch 'fix-mxwebxml'