diff --git a/vocabularies/Org.OData.Capabilities.V1.json b/vocabularies/Org.OData.Capabilities.V1.json
index 59d3d09d..4950519f 100644
--- a/vocabularies/Org.OData.Capabilities.V1.json
+++ b/vocabularies/Org.OData.Capabilities.V1.json
@@ -290,12 +290,12 @@
             },
             "TopSupported": {
                 "$Type": "Edm.Boolean",
-                "$DefaultValue": true,
+                "$Nullable": true,
                 "@Core.Description": "Supports $top"
             },
             "SkipSupported": {
                 "$Type": "Edm.Boolean",
-                "$DefaultValue": true,
+                "$Nullable": true,
                 "@Core.Description": "Supports $skip"
             },
             "SelectSupport": {
@@ -305,7 +305,7 @@
             },
             "IndexableByKey": {
                 "$Type": "Edm.Boolean",
-                "$DefaultValue": true,
+                "$Nullable": true,
                 "@Core.Description": "Supports key values according to OData URL conventions"
             },
             "InsertRestrictions": {
@@ -335,7 +335,7 @@
             },
             "OptimisticConcurrencyControl": {
                 "$Type": "Edm.Boolean",
-                "$DefaultValue": false,
+                "$Nullable": true,
                 "@Core.Description": "Data modification (including insert) along this navigation property requires the use of ETags"
             },
             "ReadRestrictions": {
diff --git a/vocabularies/Org.OData.Capabilities.V1.md b/vocabularies/Org.OData.Capabilities.V1.md
index 1968c758..c9915dd7 100644
--- a/vocabularies/Org.OData.Capabilities.V1.md
+++ b/vocabularies/Org.OData.Capabilities.V1.md
@@ -192,16 +192,16 @@ Property|Type|Description
 [FilterRestrictions](Org.OData.Capabilities.V1.xml#L266)|[FilterRestrictionsType?](#FilterRestrictionsType)|Restrictions on filter expressions
 [SearchRestrictions](Org.OData.Capabilities.V1.xml#L269)|[SearchRestrictionsType?](#SearchRestrictionsType)|Restrictions on search expressions
 [SortRestrictions](Org.OData.Capabilities.V1.xml#L272)|[SortRestrictionsType?](#SortRestrictionsType)|Restrictions on orderby expressions
-[TopSupported](Org.OData.Capabilities.V1.xml#L275)|Boolean|Supports $top
-[SkipSupported](Org.OData.Capabilities.V1.xml#L278)|Boolean|Supports $skip
+[TopSupported](Org.OData.Capabilities.V1.xml#L275)|Boolean?|Supports $top
+[SkipSupported](Org.OData.Capabilities.V1.xml#L278)|Boolean?|Supports $skip
 [SelectSupport](Org.OData.Capabilities.V1.xml#L281)|[SelectSupportType?](#SelectSupportType)|Support for $select
-[IndexableByKey](Org.OData.Capabilities.V1.xml#L284)|Boolean|Supports key values according to OData URL conventions
+[IndexableByKey](Org.OData.Capabilities.V1.xml#L284)|Boolean?|Supports key values according to OData URL conventions
 [InsertRestrictions](Org.OData.Capabilities.V1.xml#L287)|[InsertRestrictionsType?](#InsertRestrictionsType)|Restrictions on insert operations
 [DeepInsertSupport](Org.OData.Capabilities.V1.xml#L290)|[DeepInsertSupportType?](#DeepInsertSupportType)|Deep Insert Support of the annotated resource (the whole service, an entity set, or a collection-valued resource)
 [UpdateRestrictions](Org.OData.Capabilities.V1.xml#L293)|[UpdateRestrictionsType?](#UpdateRestrictionsType)|Restrictions on update operations
 [DeepUpdateSupport](Org.OData.Capabilities.V1.xml#L296)|[DeepUpdateSupportType?](#DeepUpdateSupportType)|Deep Update Support of the annotated resource (the whole service, an entity set, or a collection-valued resource)
 [DeleteRestrictions](Org.OData.Capabilities.V1.xml#L299)|[DeleteRestrictionsType?](#DeleteRestrictionsType)|Restrictions on delete operations
-[OptimisticConcurrencyControl](Org.OData.Capabilities.V1.xml#L302)|Boolean|Data modification (including insert) along this navigation property requires the use of ETags
+[OptimisticConcurrencyControl](Org.OData.Capabilities.V1.xml#L302)|Boolean?|Data modification (including insert) along this navigation property requires the use of ETags
 [ReadRestrictions](Org.OData.Capabilities.V1.xml#L305)|[ReadRestrictionsType?](#ReadRestrictionsType)|Restrictions for retrieving entities
 
 <a name="NavigationType"></a>
diff --git a/vocabularies/Org.OData.Capabilities.V1.xml b/vocabularies/Org.OData.Capabilities.V1.xml
index 7ebffc97..0f288f31 100644
--- a/vocabularies/Org.OData.Capabilities.V1.xml
+++ b/vocabularies/Org.OData.Capabilities.V1.xml
@@ -272,16 +272,16 @@ supported:
         <Property Name="SortRestrictions" Type="Capabilities.SortRestrictionsType">
           <Annotation Term="Core.Description" String="Restrictions on orderby expressions" />
         </Property>
-        <Property Name="TopSupported" Type="Edm.Boolean" Nullable="false" DefaultValue="true">
+        <Property Name="TopSupported" Type="Edm.Boolean">
           <Annotation Term="Core.Description" String="Supports $top" />
         </Property>
-        <Property Name="SkipSupported" Type="Edm.Boolean" Nullable="false" DefaultValue="true">
+        <Property Name="SkipSupported" Type="Edm.Boolean">
           <Annotation Term="Core.Description" String="Supports $skip" />
         </Property>
         <Property Name="SelectSupport" Type="Capabilities.SelectSupportType">
           <Annotation Term="Core.Description" String="Support for $select" />
         </Property>
-        <Property Name="IndexableByKey" Type="Edm.Boolean" Nullable="false" DefaultValue="true">
+        <Property Name="IndexableByKey" Type="Edm.Boolean">
           <Annotation Term="Core.Description" String="Supports key values according to OData URL conventions" />
         </Property>
         <Property Name="InsertRestrictions" Type="Capabilities.InsertRestrictionsType">
@@ -299,7 +299,7 @@ supported:
         <Property Name="DeleteRestrictions" Type="Capabilities.DeleteRestrictionsType">
           <Annotation Term="Core.Description" String="Restrictions on delete operations" />
         </Property>
-        <Property Name="OptimisticConcurrencyControl" Type="Edm.Boolean" Nullable="false" DefaultValue="false">
+        <Property Name="OptimisticConcurrencyControl" Type="Edm.Boolean">
           <Annotation Term="Core.Description" String="Data modification (including insert) along this navigation property requires the use of ETags" />
         </Property>
         <Property Name="ReadRestrictions" Type="Capabilities.ReadRestrictionsType">