Merge branch 'xdxf' into gui