--- a/2.0/core/schema/rng/xforms-nons-20.rnc	Thu May 24 14:24:16 2012 +0200
+++ b/2.0/core/schema/rng/xforms-nons-20.rnc	Thu May 24 14:39:11 2012 +0200
@@ -19,7 +19,8 @@
 
 xforms.Common.attrib =
   # host language to add common attributes here
-  attribute id { xsd:ID }?
+  attribute id { xsd:ID }?,
+  attribute context { XPathExpression }?
 xforms.Events.attrib =
   # host language to add XML Events attributes here
   empty
@@ -483,7 +484,6 @@
   element insert { xforms.insert.attrib, xforms.insert.content }
 xforms.insert.attrib =
   xforms.Common.attrib,
-  attribute context { XPathExpression }?,
   attribute origin { XPathExpression }?,
   attribute at { XPathExpression }?,
   attribute position { "before" | "after" | expr-avt.datatype }?,
@@ -494,7 +494,6 @@
   element delete { xforms.delete.attrib, xforms.delete.content }
 xforms.delete.attrib =
   xforms.Common.attrib,
-  attribute context { XPathExpression }?,
   attribute at { XPathExpression }?,
   xforms.Sequence.Binding.attrib?,
   xforms.actions.attrib

--- a/2.0/core/schema/xsd/XForms-20-Schema.xsd	Thu May 24 14:24:16 2012 +0200
+++ b/2.0/core/schema/xsd/XForms-20-Schema.xsd	Thu May 24 14:39:11 2012 +0200
@@ -91,6 +91,7 @@
 			<xsd:documentation>Attributes for _every_ element in XForms</xsd:documentation>
 		</xsd:annotation>
 		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:attribute name="context" type="xforms:XPathExpression" use="optional"/>
 		<xsd:anyAttribute namespace="##other"/>
 	</xsd:attributeGroup>
 
@@ -656,7 +657,6 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Nodeset.Binding.Attributes"/>
 			<xsd:attribute name="at" type="xforms:XPathExpression" use="optional"/>
-			<xsd:attribute name="context" type="xforms:XPathExpression" use="optional"/>
 			<xsd:attribute name="origin" type="xforms:XPathExpression" use="optional"/>
 			<xsd:attribute name="position" use="optional">
 				<xsd:simpleType>
@@ -675,7 +675,6 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Nodeset.Binding.Attributes"/>
 			<xsd:attribute name="at" type="xforms:XPathExpression" use="optional"/>
-			<xsd:attribute name="context" type="xforms:XPathExpression" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>