diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index 38b81cfb..aa6ca246 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -1559,15 +1559,78 @@
     </xsl:variable>
     <xsl:variable name="required">
       <xsl:if test="$suffix='-create'">
-        <!-- non-computed key properties are required, as are properties marked with Common.FieldControl=Mandatory -->
-        <xsl:for-each select="$structuredType/edm:Property[
-          (@Name=../edm:Key/edm:PropertyRef/@Name and not(@Name=$read-only or @Name=$computed or concat($qualifiedName,'/',@Name) = $computed-ext or concat($aliasQualifiedName,'/',@Name) = $computed-ext)) 
-          or concat($qualifiedName,'/',@Name)=$mandatory or concat($aliasQualifiedName,'/',@Name)=$mandatory]">
+        <!-- gather the RTFs for insert restrictions -->
+        <xsl:variable name="insert-restrictions">
+          <xsl:apply-templates select="$structuredType" mode="capabilities">
+            <xsl:with-param name="term" select="'InsertRestrictions'" />
+          </xsl:apply-templates>
+        </xsl:variable>
+
+        <!--non-computed key properties are required, as are properties marked with Common.FieldControl=Mandatory
+       and Capabilities.InsertRestrictions/ RequiredProperties  -->
+
+        <xsl:for-each
+            select="
+          $structuredType/edm:Property[
+            (
+              @Name = ../edm:Key/edm:PropertyRef/@Name
+              and not(
+                @Name = $read-only
+                or @Name = $computed
+                or concat($qualifiedName, '/', @Name) = $computed-ext
+                or concat($aliasQualifiedName, '/', @Name) = $computed-ext
+              )
+            )
+            or concat($qualifiedName, '/', @Name) = $mandatory
+            or concat($aliasQualifiedName, '/', @Name) = $mandatory
+            or @Name = (
+              //edm:Annotation
+                [ contains($insert-restrictions, concat(' ', generate-id(), ' ')) ]
+              /edm:Record
+              /edm:PropertyValue[@Property = 'RequiredProperties']
+              /edm:Collection
+              /edm:PropertyPath
+            )
+
+          ]">
+            <xsl:if test="position()>1">
+              <xsl:text>,</xsl:text>
+            </xsl:if>
+            <xsl:text>"</xsl:text>
+            <xsl:value-of
+              select="@Name" />
+            <xsl:text>"</xsl:text>
+        </xsl:for-each>
+      </xsl:if>
+
+
+      <xsl:if test="$suffix = '-update'">
+            <!-- gather the RTFs for update restrictions -->
+        <xsl:variable name="update-restrictions">
+          <xsl:apply-templates select="$structuredType" mode="capabilities">
+            <xsl:with-param name="term" select="'UpdateRestrictions'" />
+          </xsl:apply-templates>
+        </xsl:variable>
+            <!-- Capabilities.UpdateRestrictions/ RequiredProperties  -->
+        <xsl:for-each
+            select="
+          $structuredType/edm:Property[
+            @Name = (
+              //edm:Annotation
+                [ contains($update-restrictions, concat(' ', generate-id(), ' ')) ]
+              /edm:Record
+              /edm:PropertyValue[@Property = 'RequiredProperties']
+              /edm:Collection
+              /edm:PropertyPath
+            )
+          ]
+        ">
           <xsl:if test="position()>1">
             <xsl:text>,</xsl:text>
           </xsl:if>
           <xsl:text>"</xsl:text>
-          <xsl:value-of select="@Name" />
+          <xsl:value-of
+            select="@Name" />
           <xsl:text>"</xsl:text>
         </xsl:for-each>
       </xsl:if>
@@ -2737,7 +2800,23 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
+  <xsl:template match="edm:EntityType" mode="capabilities">
+    <xsl:param name="term" />
+    <xsl:for-each select="//edm:EntitySet[
+      @EntityType=concat(current()/../@Namespace,'.',current()/@Name) or
+      @EntityType=concat(current()/../@Alias,'.',current()/@Name)]">
+      <xsl:variable name="target-path" select="concat(../../@Namespace,'.',../@Name,'/',@Name)" />
+      <xsl:variable name="target-path-aliased" select="concat(../../@Alias,'.',../@Name,'/',@Name)" />
+      <xsl:variable name="annos" select="key('externalAnnotations',$target-path)|key('externalAnnotations',$target-path-aliased)|." />
+      <xsl:for-each select="$annos/edm:Annotation[not(@Qualifier) and
+        @Term=concat($capabilitiesNamespace,'.',$term) or
+        @Term=concat($capabilitiesAlias,'.',$term)]">
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="generate-id()" />
+        <xsl:text> </xsl:text>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
   <xsl:template match="edm:EntitySet">
     <xsl:variable name="target-path" select="concat(../../@Namespace,'.',../@Name,'/',@Name)" />
     <xsl:variable name="target-path-aliased" select="concat(../../@Alias,'.',../@Name,'/',@Name)" />