Merge branch 'issue721' into 1.6.x
add new testcase for xml model creation
fix merge conflicts