Merge "Fix 2 0.8 to 0.9 in export-0.9.xsd"