diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index 0c60fcf8..c8688088 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -108,6 +108,8 @@
   <xsl:variable name="coreAcceptableMediaTypesAliased" select="concat($coreAlias,'.AcceptableMediaTypes')" />
   <xsl:variable name="coreComputed" select="concat($coreNamespace,'.Computed')" />
   <xsl:variable name="coreComputedAliased" select="concat($coreAlias,'.Computed')" />
+  <xsl:variable name="coreComputedDefaultValue" select="concat($coreNamespace,'.ComputedDefaultValue')" />
+  <xsl:variable name="coreComputedDefaultValueAliased" select="concat($coreAlias,'.ComputedDefaultValue')" />
   <xsl:variable name="coreDefaultNamespace" select="concat($coreNamespace,'.DefaultNamespace')" />
   <xsl:variable name="coreDefaultNamespaceAliased" select="concat($coreAlias,'.DefaultNamespace')" />
   <xsl:variable name="coreDescription" select="concat($coreNamespace,'.Description')" />
@@ -177,10 +179,6 @@
 
   <xsl:variable name="commonNamespace" select="'com.sap.vocabularies.Common.v1'" />
   <xsl:variable name="commonAlias" select="/edmx:Edmx/edmx:Reference/edmx:Include[@Namespace=$commonNamespace]/@Alias" />
-  <xsl:variable name="commonFieldControl" select="concat($commonNamespace,'.FieldControl')" />
-  <xsl:variable name="commonFieldControlAliased" select="concat($commonAlias,'.FieldControl')" />
-  <xsl:variable name="commonFieldControlMandatory" select="concat($commonNamespace,'.FieldControlType/Mandatory')" />
-  <xsl:variable name="commonFieldControlMandatoryAliased" select="concat($commonAlias,'.FieldControlType/Mandatory')" />
   <xsl:variable name="commonLabel" select="concat($commonNamespace,'.Label')" />
   <xsl:variable name="commonLabelAliased" select="concat($commonAlias,'.Label')" />
   <xsl:variable name="commonQuickInfo" select="concat($commonNamespace,'.QuickInfo')" />
@@ -1493,6 +1491,9 @@
     <xsl:variable name="computed" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreComputed or @Term=$coreComputedAliased]]/@Name" />
     <xsl:variable name="computed-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
                                               [edm:Annotation[@Term=$coreComputed or @Term=$coreComputedAliased]]/@Target" />
+    <xsl:variable name="computeddefaultvalue" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreComputedDefaultValue or @Term=$coreComputedDefaultValueAliased]]/@Name" />
+    <xsl:variable name="computeddefaultvalue-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
+                                              [edm:Annotation[@Term=$coreComputedDefaultValue or @Term=$coreComputedDefaultValueAliased]]/@Target" />
 
     <xsl:variable name="immutable" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreImmutable or @Term=$coreImmutableAliased]]/@Name" />
     <xsl:variable name="immutable-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
@@ -1503,11 +1504,6 @@
                                            /edm:EnumMember[.=$corePermissionRead or .=$corePermissionReadAliased]]/@Name" />
     <!-- TODO: also nested annotations -->
     <!-- TODO: also edm:EnumMember -->
-    <xsl:variable name="mandatory" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
-                                           [edm:Annotation[(@Term=$commonFieldControl or @Term=$commonFieldControlAliased)
-                                            and (@EnumMember=$commonFieldControlMandatory or @EnumMember=$commonFieldControlMandatoryAliased)]]/@Target" />
-    <!-- TODO: also nested annotations -->
-    <!-- TODO: also edm:EnumMember -->
     <xsl:variable name="navprop-read-only" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
                                                    [edm:Annotation[(@Term=$corePermissions or @Term=$corePermissionsAliased)
                                                     and (@EnumMember=$corePermissionRead or @EnumMember=$corePermissionReadAliased)]]/@Target" />
@@ -1556,10 +1552,11 @@
     </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 -->
+        <!-- non-computed key properties are required -->
         <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]">
+          @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 @Name=$computeddefaultvalue or concat($qualifiedName,'/',@Name) = $computeddefaultvalue-ext or concat($aliasQualifiedName,'/',@Name) = $computeddefaultvalue-ext)]">
           <xsl:if test="position()>1">
             <xsl:text>,</xsl:text>
           </xsl:if>
diff --git a/tools/tests/annotations.openapi3.json b/tools/tests/annotations.openapi3.json
index b76926be..01e0723e 100644
--- a/tools/tests/annotations.openapi3.json
+++ b/tools/tests/annotations.openapi3.json
@@ -3134,9 +3134,7 @@
                     }
                 },
                 "required": [
-                    "ID",
-                    "PatternExt",
-                    "AllowedValuesExt"
+                    "ID"
                 ],
                 "title": "SinglePartKey (for create)"
             },
diff --git a/tools/tests/annotations.swagger.json b/tools/tests/annotations.swagger.json
index dce97dda..acecabe1 100644
--- a/tools/tests/annotations.swagger.json
+++ b/tools/tests/annotations.swagger.json
@@ -2783,9 +2783,7 @@
                 }
             },
             "required": [
-                "ID",
-                "PatternExt",
-                "AllowedValuesExt"
+                "ID"
             ],
             "title": "SinglePartKey (for create)"
         },
diff --git a/tools/tests/csdl-16.1.openapi3.json b/tools/tests/csdl-16.1.openapi3.json
index ce5a29d6..9b74f460 100644
--- a/tools/tests/csdl-16.1.openapi3.json
+++ b/tools/tests/csdl-16.1.openapi3.json
@@ -2043,9 +2043,6 @@
                         ]
                     }
                 },
-                "required": [
-                    "ID"
-                ],
                 "title": "Product (for create)"
             },
             "ODataDemo.Product-update": {
diff --git a/tools/tests/csdl-16.1.swagger.json b/tools/tests/csdl-16.1.swagger.json
index 02bef9a7..998ff9f6 100644
--- a/tools/tests/csdl-16.1.swagger.json
+++ b/tools/tests/csdl-16.1.swagger.json
@@ -1796,9 +1796,6 @@
                     "$ref": "#/definitions/ODataDemo.Supplier-create"
                 }
             },
-            "required": [
-                "ID"
-            ],
             "title": "Product (for create)"
         },
         "ODataDemo.Product-update": {
diff --git a/tools/tests/csdl-16.1.xml b/tools/tests/csdl-16.1.xml
index dd87d986..035e2609 100644
--- a/tools/tests/csdl-16.1.xml
+++ b/tools/tests/csdl-16.1.xml
@@ -18,7 +18,9 @@
         <Key>
           <PropertyRef Name="ID" />
         </Key>
-        <Property Name="ID" Type="Edm.String" Nullable="false" />
+        <Property Name="ID" Type="Edm.String" Nullable="false">
+          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" />
+        </Property>
         <Property Name="Description" Type="Edm.String">
           <Annotation Term="Core.IsLanguageDependent" />
         </Property>