diff --git a/spec/fixtures/odk/forms/allows_incomplete.xml b/spec/fixtures/odk/forms/allows_incomplete.xml
index 61f83159e5..ea24d46630 100644
--- a/spec/fixtures/odk/forms/allows_incomplete.xml
+++ b/spec/fixtures/odk/forms/allows_incomplete.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -8,6 +8,9 @@
           <*itemcode1*/>
           <ir01/>
           <ir02/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/bilingual.xml b/spec/fixtures/odk/forms/bilingual.xml
index 64bc3a5f12..e8bee6498e 100644
--- a/spec/fixtures/odk/forms/bilingual.xml
+++ b/spec/fixtures/odk/forms/bilingual.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>Sample Form 1</h:title>
     <model>
       <instance>
         <data id="*form1*" version="*formver1*">
           <*itemcode1*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/conditional_logic.xml b/spec/fixtures/odk/forms/conditional_logic.xml
index 6cafb6ecb7..43ccf62c00 100644
--- a/spec/fixtures/odk/forms/conditional_logic.xml
+++ b/spec/fixtures/odk/forms/conditional_logic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -17,6 +17,9 @@
           <*itemcode9*/>
           <*itemcode10*/>
           <*itemcode11*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode2*_level2">
diff --git a/spec/fixtures/odk/forms/default_patterns.xml b/spec/fixtures/odk/forms/default_patterns.xml
index 5b25caaf6b..b4526bc6e3 100644
--- a/spec/fixtures/odk/forms/default_patterns.xml
+++ b/spec/fixtures/odk/forms/default_patterns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -17,6 +17,9 @@
             <*itemcode5*_2/>
           </*itemcode1*>
           <*itemcode6*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode2*_level2">
diff --git a/spec/fixtures/odk/forms/dynamic_values.xml b/spec/fixtures/odk/forms/dynamic_values.xml
index d69599c48f..3f7bfbed4c 100644
--- a/spec/fixtures/odk/forms/dynamic_values.xml
+++ b/spec/fixtures/odk/forms/dynamic_values.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>Dynamic answers for option sets</h:title>
     <model>
@@ -11,6 +11,9 @@
             <*itemcode3*/>
             <*itemcode4*/>
           </*itemcode2*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_numeric_values">
diff --git a/spec/fixtures/odk/forms/empty_and_disabled.xml b/spec/fixtures/odk/forms/empty_and_disabled.xml
index a46dd6d826..f17c7e8e4d 100644
--- a/spec/fixtures/odk/forms/empty_and_disabled.xml
+++ b/spec/fixtures/odk/forms/empty_and_disabled.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -16,6 +16,9 @@
           <*itemcode6* jr:template="">
             <header/>
           </*itemcode6*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/empty_and_hidden.xml b/spec/fixtures/odk/forms/empty_and_hidden.xml
index 7e8fc844e0..be3eb89c8d 100644
--- a/spec/fixtures/odk/forms/empty_and_hidden.xml
+++ b/spec/fixtures/odk/forms/empty_and_hidden.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -22,6 +22,9 @@
             <header/>
             <*itemcode9*/>
           </*itemcode8*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/grid_group_with_condition.xml b/spec/fixtures/odk/forms/grid_group_with_condition.xml
index 3fd461fbad..95af0bd6d9 100644
--- a/spec/fixtures/odk/forms/grid_group_with_condition.xml
+++ b/spec/fixtures/odk/forms/grid_group_with_condition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -13,6 +13,9 @@
             <*itemcode4*/>
           </*itemcode2*>
           <*itemcode5*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/media_prompts.xml b/spec/fixtures/odk/forms/media_prompts.xml
index 0bb3f19b72..c7da1e8f43 100644
--- a/spec/fixtures/odk/forms/media_prompts.xml
+++ b/spec/fixtures/odk/forms/media_prompts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -8,6 +8,9 @@
           <*itemcode1*/>
           <*itemcode2*/>
           <*itemcode3*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/media_questions.xml b/spec/fixtures/odk/forms/media_questions.xml
index 60cfd14026..6e6d992a6f 100644
--- a/spec/fixtures/odk/forms/media_questions.xml
+++ b/spec/fixtures/odk/forms/media_questions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -12,6 +12,9 @@
           <*itemcode5*/>
           <*itemcode6*/>
           <*itemcode7*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/multi_screen_gridable.xml b/spec/fixtures/odk/forms/multi_screen_gridable.xml
index 8ba24329d1..4010417833 100644
--- a/spec/fixtures/odk/forms/multi_screen_gridable.xml
+++ b/spec/fixtures/odk/forms/multi_screen_gridable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -10,6 +10,9 @@
             <*itemcode2*/>
             <*itemcode3*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/multi_screen_group.xml b/spec/fixtures/odk/forms/multi_screen_group.xml
index 44f1b54a2f..c3ed42f42c 100644
--- a/spec/fixtures/odk/forms/multi_screen_group.xml
+++ b/spec/fixtures/odk/forms/multi_screen_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -11,6 +11,9 @@
             <*itemcode3*/>
             <*itemcode4*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/multiscreen_group_with_multilevel.xml b/spec/fixtures/odk/forms/multiscreen_group_with_multilevel.xml
index 00629358a6..283acecfba 100644
--- a/spec/fixtures/odk/forms/multiscreen_group_with_multilevel.xml
+++ b/spec/fixtures/odk/forms/multiscreen_group_with_multilevel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -13,6 +13,9 @@
             <*itemcode4*_2/>
             <*itemcode5*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_level2">
diff --git a/spec/fixtures/odk/forms/nested_group_with_multilevel.xml b/spec/fixtures/odk/forms/nested_group_with_multilevel.xml
index 99d2b88d9b..1543d95a7e 100644
--- a/spec/fixtures/odk/forms/nested_group_with_multilevel.xml
+++ b/spec/fixtures/odk/forms/nested_group_with_multilevel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -17,6 +17,9 @@
             </*itemcode4*>
             <*itemcode7*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_level2">
diff --git a/spec/fixtures/odk/forms/nested_repeat_group.xml b/spec/fixtures/odk/forms/nested_repeat_group.xml
index 5431df607f..c9e8962193 100644
--- a/spec/fixtures/odk/forms/nested_repeat_group.xml
+++ b/spec/fixtures/odk/forms/nested_repeat_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -26,6 +26,9 @@
             <*itemcode12*/>
             <*itemcode13*/>
           </*itemcode9*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/non_repeat_group_with_condition.xml b/spec/fixtures/odk/forms/non_repeat_group_with_condition.xml
index f858f7a40e..6c5b5ec079 100644
--- a/spec/fixtures/odk/forms/non_repeat_group_with_condition.xml
+++ b/spec/fixtures/odk/forms/non_repeat_group_with_condition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -12,6 +12,9 @@
             <*itemcode4*/>
             <*itemcode5*/>
           </*itemcode2*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/non_repeat_group_with_multilevel_select.xml b/spec/fixtures/odk/forms/non_repeat_group_with_multilevel_select.xml
index f060f58093..f59c7a1344 100644
--- a/spec/fixtures/odk/forms/non_repeat_group_with_multilevel_select.xml
+++ b/spec/fixtures/odk/forms/non_repeat_group_with_multilevel_select.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -13,6 +13,9 @@
             <*itemcode4*_2/>
             <*itemcode5*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_level2">
diff --git a/spec/fixtures/odk/forms/preload_last_saved.xml b/spec/fixtures/odk/forms/preload_last_saved.xml
index dbda0225d3..daef34d159 100644
--- a/spec/fixtures/odk/forms/preload_last_saved.xml
+++ b/spec/fixtures/odk/forms/preload_last_saved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -8,6 +8,9 @@
           <*itemcode1*/>
           <*itemcode2*/>
           <*itemcode3*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="last-saved" src="jr://instance/last-saved"/>
diff --git a/spec/fixtures/odk/forms/repeat_group.xml b/spec/fixtures/odk/forms/repeat_group.xml
index 6dc301984e..54b75f9762 100644
--- a/spec/fixtures/odk/forms/repeat_group.xml
+++ b/spec/fixtures/odk/forms/repeat_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -21,6 +21,9 @@
             <*itemcode9*/>
             <*itemcode10*/>
           </*itemcode8*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/repeat_group_count.xml b/spec/fixtures/odk/forms/repeat_group_count.xml
index c9ea50d914..2a10ca4e00 100644
--- a/spec/fixtures/odk/forms/repeat_group_count.xml
+++ b/spec/fixtures/odk/forms/repeat_group_count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -22,6 +22,9 @@
             <*itemcode10*/>
             <*itemcode11*/>
           </*itemcode9*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/repeat_group_count_nested.xml b/spec/fixtures/odk/forms/repeat_group_count_nested.xml
index 92a4c6291f..03e9b84758 100644
--- a/spec/fixtures/odk/forms/repeat_group_count_nested.xml
+++ b/spec/fixtures/odk/forms/repeat_group_count_nested.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -25,6 +25,9 @@
             <*itemcode11*/>
             <*itemcode12*/>
           </*itemcode10*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/single_screen_repeat_group_with_condition.xml b/spec/fixtures/odk/forms/single_screen_repeat_group_with_condition.xml
index aca6b131a9..815bf18173 100644
--- a/spec/fixtures/odk/forms/single_screen_repeat_group_with_condition.xml
+++ b/spec/fixtures/odk/forms/single_screen_repeat_group_with_condition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -11,6 +11,9 @@
             <*itemcode3*/>
             <*itemcode4*/>
           </*itemcode1*>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <itext>
diff --git a/spec/fixtures/odk/forms/small_large_multilevel.xml b/spec/fixtures/odk/forms/small_large_multilevel.xml
index f99ce8b043..744e681041 100644
--- a/spec/fixtures/odk/forms/small_large_multilevel.xml
+++ b/spec/fixtures/odk/forms/small_large_multilevel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -10,6 +10,9 @@
           <*itemcode2*_1/>
           <*itemcode2*_2/>
           <*itemcode2*_3/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_level2">
diff --git a/spec/fixtures/odk/forms/standard_copy_with_xpath.xml b/spec/fixtures/odk/forms/standard_copy_with_xpath.xml
index 446341c018..501307895e 100644
--- a/spec/fixtures/odk/forms/standard_copy_with_xpath.xml
+++ b/spec/fixtures/odk/forms/standard_copy_with_xpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>Dynamic answers for option sets</h:title>
     <model>
@@ -7,6 +7,9 @@
         <data id="*form1*" version="*formver1*">
           <*itemcode1*/>
           <*itemcode2*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode1*_numeric_values">
diff --git a/spec/fixtures/odk/forms/various_question_types.xml b/spec/fixtures/odk/forms/various_question_types.xml
index b2b200e79c..9b814177df 100644
--- a/spec/fixtures/odk/forms/various_question_types.xml
+++ b/spec/fixtures/odk/forms/various_question_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -22,6 +22,9 @@
           <*itemcode14*/>
           <*itemcode15*/>
           <*itemcode16*/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode2*_level2">
diff --git a/spec/fixtures/odk/forms/various_selects.xml b/spec/fixtures/odk/forms/various_selects.xml
index 453f03300c..8691c07664 100644
--- a/spec/fixtures/odk/forms/various_selects.xml
+++ b/spec/fixtures/odk/forms/various_selects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:orx="https://openrosa.org/xforms">
   <h:head>
     <h:title>*formname1*</h:title>
     <model>
@@ -11,6 +11,9 @@
           <*itemcode3*_1/>
           <*itemcode3*_2/>
           <*itemcode3*_3/>
+          <orx:meta>
+            <orx:instanceID/>
+          </orx:meta>
         </data>
       </instance>
       <instance id="*optsetcode2*_level2">