diff --git a/sample/ODataAlternateKeySample/Controllers/CustomersController.cs b/sample/ODataAlternateKeySample/Controllers/CustomersController.cs
index 155c0af6c..84f93b415 100644
--- a/sample/ODataAlternateKeySample/Controllers/CustomersController.cs
+++ b/sample/ODataAlternateKeySample/Controllers/CustomersController.cs
@@ -50,7 +50,8 @@ public IActionResult Post([FromBody]Customer c)
         }
 
         // Alternate key: SSN
-        [HttpGet("odata/Customers(SSN={ssn})")]
+        [HttpGet("odata/Customers(SSN={ssn})")] // use community alternate key
+        [HttpGet("odata/Customers(CoreSN={ssn})")] // use core alternate key
         public IActionResult GetCustomerBySSN(string ssn)
         {
             var c = _repository.GetCustomers().FirstOrDefault(c => c.SSN == ssn);
@@ -62,7 +63,8 @@ public IActionResult GetCustomerBySSN(string ssn)
             return Ok(c);
         }
 
-        [HttpPatch("odata/Customers(SSN={ssnKey})")]
+        [HttpPatch("odata/Customers(SSN={ssnKey})")] // use community alternate key
+        [HttpPatch("odata/Customers(CoreSN={ssnKey})")] // use core alternate key
         public IActionResult PatchCustomerBySSN(string ssnKey, Delta<Customer> delta)
         {
             var originalCustomer = _repository.GetCustomers().FirstOrDefault(c => c.SSN == ssnKey);
diff --git a/sample/ODataAlternateKeySample/Controllers/OrdersController.cs b/sample/ODataAlternateKeySample/Controllers/OrdersController.cs
index 323f62b1a..5c921ce00 100644
--- a/sample/ODataAlternateKeySample/Controllers/OrdersController.cs
+++ b/sample/ODataAlternateKeySample/Controllers/OrdersController.cs
@@ -42,7 +42,8 @@ public IActionResult Get(int key)
         }
 
         // alternate key: Name
-        [HttpGet("odata/Orders(Name={orderName})")]
+        [HttpGet("odata/Orders(Name={orderName})")] // use community alternate key
+        [HttpGet("odata/Orders(CoreName={orderName})")] // use core alternate key
         public IActionResult GetOrderByName(string orderName)
         {
             var c = _repository.GetOrders().FirstOrDefault(c => c.Name == orderName);
@@ -55,7 +56,8 @@ public IActionResult GetOrderByName(string orderName)
         }
 
         // alternate key: Token
-        [HttpGet("odata/Orders(Token={token})")]
+        [HttpGet("odata/Orders(Token={token})")] // use community alternate key
+        [HttpGet("odata/Orders(CoreToken={token})")] // use core alternate key
         public IActionResult GetOrderByToken(Guid token)
         {
             var c = _repository.GetOrders().FirstOrDefault(c => c.Token == token);
diff --git a/sample/ODataAlternateKeySample/Controllers/PeopleController.cs b/sample/ODataAlternateKeySample/Controllers/PeopleController.cs
index 5786872dd..43454a58b 100644
--- a/sample/ODataAlternateKeySample/Controllers/PeopleController.cs
+++ b/sample/ODataAlternateKeySample/Controllers/PeopleController.cs
@@ -41,7 +41,8 @@ public IActionResult Get(int key)
             return Ok(c);
         }
 
-        [HttpGet("odata/People(c_or_r={cr},passport={passport})")]
+        [HttpGet("odata/People(c_or_r={cr},passport={passport})")] // use community alternate key
+        [HttpGet("odata/People(core_c_r={cr},core_passport={passport})")] // use core alternate key
         public IActionResult FindPeopleByCountryAndPassport(string cr, string passport)
         {
             var c = _repository.GetPeople().FirstOrDefault(c => c.CountryOrRegion == cr && c.Passport == passport);
diff --git a/sample/ODataAlternateKeySample/Models/EdmModelBuilder.cs b/sample/ODataAlternateKeySample/Models/EdmModelBuilder.cs
index 18de67924..5fd0fd6a1 100644
--- a/sample/ODataAlternateKeySample/Models/EdmModelBuilder.cs
+++ b/sample/ODataAlternateKeySample/Models/EdmModelBuilder.cs
@@ -6,6 +6,8 @@
 //------------------------------------------------------------------------------
 
 using Microsoft.OData.Edm;
+using Microsoft.OData.Edm.Csdl;
+using Microsoft.OData.Edm.Vocabularies;
 using Microsoft.OData.ModelBuilder;
 
 namespace ODataAlternateKeySample.Models
@@ -38,6 +40,13 @@ private static void SetCustomerAlternateKey(EdmModel model)
             {
                 {"SSN", ssn}
             });
+
+            // Use Core Vocabulary version.
+            model.AddAlternateKeyAnnotation(customer, new Dictionary<string, IEdmProperty>()
+            {
+                {"CoreSN", ssn}
+            },
+            true /*true means to use core.alternatekeys term*/);
         }
 
         private static void SetOrderAlternateKey(EdmModel model)
@@ -58,15 +67,14 @@ private static void SetOrderAlternateKey(EdmModel model)
                 {"Token", token},
             });
 
-            // ODL doesn't support Org.OData.Core.V1.AlternateKeys to do the uri parsing
-            /*
+            // Use the APIs to build the core alternate keys
             var alternateKeysCollection = new List<IEdmExpression>();
             foreach (string item in new [] { "Name", "Token"})
             {
                 List<IEdmExpression> propertyRefs = new List<IEdmExpression>();
 
                 IEdmRecordExpression propertyRef = new EdmRecordExpression(
-                    new EdmPropertyConstructor("Alias", new EdmStringConstant(item)),
+                    new EdmPropertyConstructor("Alias", new EdmStringConstant($"Core{item}")),
                     new EdmPropertyConstructor("Name", new EdmPropertyPathExpression(item)));
                 propertyRefs.Add(propertyRef);
 
@@ -81,7 +89,6 @@ private static void SetOrderAlternateKey(EdmModel model)
 
             annotation.SetSerializationLocation(model, EdmVocabularyAnnotationSerializationLocation.Inline);
             model.SetVocabularyAnnotation(annotation);
-            */
         }
 
         private static void SetPersonAlternateKey(EdmModel model)
@@ -98,32 +105,13 @@ private static void SetPersonAlternateKey(EdmModel model)
                 {"passport", passport},
             });
 
-            // ODL doesn't support Org.OData.Core.V1.AlternateKeys to do the uri parsing
-            /*
-            List<IEdmExpression> propertyRefs = new List<IEdmExpression>();
-
-            IEdmRecordExpression propertyRef = new EdmRecordExpression(
-                new EdmPropertyConstructor("Alias", new EdmStringConstant("CountryOrRegion")),
-                new EdmPropertyConstructor("Name", new EdmPropertyPathExpression("CountryOrRegion")));
-            propertyRefs.Add(propertyRef);
-
-            propertyRef = new EdmRecordExpression(
-                new EdmPropertyConstructor("Alias", new EdmStringConstant("Passport")),
-                new EdmPropertyConstructor("Name", new EdmPropertyPathExpression("Passport")));
-            propertyRefs.Add(propertyRef);
-
-            EdmRecordExpression alternateKeyRecord = new EdmRecordExpression(
-               new EdmPropertyConstructor("Key", new EdmCollectionExpression(propertyRefs)));
-
-            var alternateKeysCollection = new List<IEdmExpression>();
-            alternateKeysCollection.Add(alternateKeyRecord);
-
-            var term = model.FindTerm("Org.OData.Core.V1.AlternateKeys");
-            var annotation = new EdmVocabularyAnnotation(person, term, new EdmCollectionExpression(alternateKeysCollection));
-
-            annotation.SetSerializationLocation(model, EdmVocabularyAnnotationSerializationLocation.Inline);
-            model.SetVocabularyAnnotation(annotation);
-            */
+            // Use Core Vocabulary version.
+            model.AddAlternateKeyAnnotation(person, new Dictionary<string, IEdmProperty>
+            {
+                {"core_c_r", cr},
+                {"core_passport", passport},
+            },
+            true);
         }
     }
 }
diff --git a/sample/ODataAlternateKeySample/readme.md b/sample/ODataAlternateKeySample/readme.md
index e86e4fabe..593db7598 100644
--- a/sample/ODataAlternateKeySample/readme.md
+++ b/sample/ODataAlternateKeySample/readme.md
@@ -5,24 +5,32 @@ This sample illustrates how to use the Alternate key in ASP.NET Core OData 8.x.
 
 Alternate key is an 'alternate' key compared to the declared key.
 
+You can use `Org.OData.Core.V1.AlternateKey` term to define the alternate key vocabulary annotation, that's the recommended way.
+
+For backward compatible, it also supports `OData.Community.Keys.V1.AlternateKeys` alternate key term.
+
 For example, any customer can have a `Id` as his declared key, meanwhile, he can also have `SSN` as his identity.
 
 The sample implements three alternate key scenarios:
 
 1. Single alternate key
    - Using declared keys : ~/odata/Customers(3)
-   - Using alternate keys: ~/odata/Customer(SSN='SSN-3-103')
+   - Using community alternate keys: ~/odata/Customers(SSN='SSN-3-103')
+   - Using core alternate keys: ~/odata/Customers(CoreSN='SSN-3-103')
 
 2. Multiple alternate keys
    - Using declared keys : ~/odata/Orders(2)
-   - Using alternate keys: ~/odata/Orders(Name='Order-2')
-   - Using alternate keys: ~/odata/Orders(Token=75036B94-C836-4946-8CC8-054CF54060EC)
+   - Using community alternate keys: ~/odata/Orders(Name='Order-2')
+   - Using community alternate keys: ~/odata/Orders(Token=75036B94-C836-4946-8CC8-054CF54060EC)
+   - Using core alternate keys: ~/odata/Orders(CoreName='Order-2')
+   - Using core alternate keys: ~/odata/Orders(CoreToken=75036B94-C836-4946-8CC8-054CF54060EC)
 
 3. Composition alternate keys
    - Using declared keys : ~/odata/People(2)
-   - Using alternate keys: ~/odata/People(CountryOrRegion='USA',Passport='9999')
+   - Using community alternate keys: ~/odata/People(c_or_r='USA',passport='9999')
+   - Using core keys: ~/odata/People(core_c_r='USA',core_passport='9999')
 
-You may noticed that you should use the `alternateKeyAlias=alternateKeyValue` pattern to invoke the API.
+You may notice that we should use the `alternateKeyAlias=alternateKeyValue` pattern to invoke the API. It's only supported using attribute routing.
 
 ## Verify the Model
 
@@ -32,9 +40,9 @@ Send `GET http://localhost:5219/odata/$metadata`
 
 You can get the following metadata.
 
-1) <strong>Customer</strong> type has `OData.Community.Keys.V1.AlternateKeys` annotation with one alternate key
-2) <strong>Order</strong> type has `OData.Community.Keys.V1.AlternateKeys` annotation with two alternate keys
-3) <strong>Person</strong> type has `OData.Community.Keys.V1.AlternateKeys` annotation with one alternate key, in which has two records
+1) <strong>Customer</strong> type has `OData.Community.Keys.V1.AlternateKeys` and `Org.OData.Core.V1.AlternateKey` annotation with one alternate key
+2) <strong>Order</strong> type has `OData.Community.Keys.V1.AlternateKeys` and `Org.OData.Core.V1.AlternateKey` annotation with two alternate keys
+3) <strong>Person</strong> type has `OData.Community.Keys.V1.AlternateKeys` and `Org.OData.Core.V1.AlternateKey` annotation with one composite alternate key
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -48,6 +56,7 @@ You can get the following metadata.
                 <Property Name="Id" Type="Edm.Int32" Nullable="false" />
                 <Property Name="Name" Type="Edm.String" />
                 <Property Name="SSN" Type="Edm.String" />
+                <Property Name="Titles" Type="Collection(Edm.String)" />
                 <Annotation Term="OData.Community.Keys.V1.AlternateKeys">
                     <Collection>
                         <Record Type="OData.Community.Keys.V1.AlternateKey">
@@ -62,6 +71,20 @@ You can get the following metadata.
                         </Record>
                     </Collection>
                 </Annotation>
+                <Annotation Term="Org.OData.Core.V1.AlternateKeys">
+                    <Collection>
+                        <Record Type="Org.OData.Core.V1.AlternateKey">
+                            <PropertyValue Property="Key">
+                                <Collection>
+                                    <Record Type="Org.OData.Core.V1.PropertyRef">
+                                        <PropertyValue Property="Alias" String="CoreSN" />
+                                        <PropertyValue Property="Name" PropertyPath="SSN" />
+                                    </Record>
+                                </Collection>
+                            </PropertyValue>
+                        </Record>
+                    </Collection>
+                </Annotation>
             </EntityType>
             <EntityType Name="Order">
                 <Key>
@@ -70,7 +93,7 @@ You can get the following metadata.
                 <Property Name="Id" Type="Edm.Int32" Nullable="false" />
                 <Property Name="Name" Type="Edm.String" />
                 <Property Name="Token" Type="Edm.Guid" Nullable="false" />
-                <Property Name="Price" Type="Edm.Decimal" Nullable="false" />
+                <Property Name="Price" Type="Edm.Decimal" Nullable="false" Scale="Variable" />
                 <Property Name="Amount" Type="Edm.Int32" Nullable="false" />
                 <Annotation Term="OData.Community.Keys.V1.AlternateKeys">
                     <Collection>
@@ -96,6 +119,30 @@ You can get the following metadata.
                         </Record>
                     </Collection>
                 </Annotation>
+                <Annotation Term="Org.OData.Core.V1.AlternateKeys">
+                    <Collection>
+                        <Record>
+                            <PropertyValue Property="Key">
+                                <Collection>
+                                    <Record>
+                                        <PropertyValue Property="Alias" String="CoreName" />
+                                        <PropertyValue Property="Name" PropertyPath="Name" />
+                                    </Record>
+                                </Collection>
+                            </PropertyValue>
+                        </Record>
+                        <Record>
+                            <PropertyValue Property="Key">
+                                <Collection>
+                                    <Record>
+                                        <PropertyValue Property="Alias" String="CoreToken" />
+                                        <PropertyValue Property="Name" PropertyPath="Token" />
+                                    </Record>
+                                </Collection>
+                            </PropertyValue>
+                        </Record>
+                    </Collection>
+                </Annotation>
             </EntityType>
             <EntityType Name="Person">
                 <Key>
@@ -123,6 +170,24 @@ You can get the following metadata.
                         </Record>
                     </Collection>
                 </Annotation>
+                <Annotation Term="Org.OData.Core.V1.AlternateKeys">
+                    <Collection>
+                        <Record Type="Org.OData.Core.V1.AlternateKey">
+                            <PropertyValue Property="Key">
+                                <Collection>
+                                    <Record Type="Org.OData.Core.V1.PropertyRef">
+                                        <PropertyValue Property="Alias" String="core_c_r" />
+                                        <PropertyValue Property="Name" PropertyPath="CountryOrRegion" />
+                                    </Record>
+                                    <Record Type="Org.OData.Core.V1.PropertyRef">
+                                        <PropertyValue Property="Alias" String="core_passport" />
+                                        <PropertyValue Property="Name" PropertyPath="Passport" />
+                                    </Record>
+                                </Collection>
+                            </PropertyValue>
+                        </Record>
+                    </Collection>
+                </Annotation>
             </EntityType>
         </Schema>
         <Schema Namespace="Default" xmlns="http://docs.oasis-open.org/odata/ns/edm">
@@ -142,7 +207,8 @@ Send one of the following requests
 
 ```C#
 GET http://localhost:5219/odata/Customers(2)
-GET http://localhost:5219/odata/Customers(ssn='SSN-2-102')
+GET http://localhost:5219/odata/Customers(SSN='SSN-2-102')
+GET http://localhost:5219/odata/Customers(CoreSN='SSN-2-102')
 ```
 
 you can get the following result:
@@ -151,7 +217,12 @@ you can get the following result:
     "@odata.context": "http://localhost:5219/odata/$metadata#Customers/$entity",
     "Id": 2,
     "Name": "Jerry",
-    "SSN": "SSN-2-102"
+    "SSN": "SSN-2-102",
+    "Titles": [
+        "abc",
+        null,
+        "efg"
+    ]
 }
 ```
 
@@ -163,6 +234,8 @@ Send one of the following requests
 GET http://localhost:5219/odata/orders(3)
 GET http://localhost:5219/odata/orders(Name='Order-3')
 GET http://localhost:5219/odata/orders(Token=75036b94-c836-4946-8cc8-054cf54060ec)
+GET http://localhost:5219/odata/Orders(CoreName='Order-3')
+GET http://localhost:5219/odata/Orders(CoreToken=75036B94-C836-4946-8CC8-054CF54060EC)
 ```
 
 you can get the following result:
@@ -183,7 +256,8 @@ Send one of the following requests
 
 ```C#
 GET http://localhost:5219/odata/People(3)
-GET ttp://localhost:5219/odata/People(c_or_r='USA',passport='9999')
+GET http://localhost:5219/odata/People(c_or_r='USA',passport='9999')
+GET http://localhost:5219/odata/People(core_c_r='USA',core_passport='9999')
 ```
 
 you can get the following result:
@@ -196,3 +270,5 @@ you can get the following result:
     "Passport": "9999"
 }
 ```
+
+Thanks!
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
index 10eda6270..7a13ad99f 100644
--- a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
+++ b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
@@ -1094,6 +1094,20 @@
             <param name="clrType">The type to test.</param>
             <returns>True if the type is a DateTime; false otherwise.</returns>
         </member>
+        <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsDateOnly(System.Type)">
+            <summary>
+            Determine if a type is a <see cref="T:System.DateOnly"/>.
+            </summary>
+            <param name="clrType">The type to test.</param>
+            <returns>True if the type is a DateOnly; false otherwise.</returns>
+        </member>
+        <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsTimeOnly(System.Type)">
+            <summary>
+            Determine if a type is a <see cref="T:System.TimeOnly"/>.
+            </summary>
+            <param name="clrType">The type to test.</param>
+            <returns>True if the type is a TimeOnly; false otherwise.</returns>
+        </member>
         <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsTimeSpan(System.Type)">
             <summary>
             Determine if a type is a TimeSpan.
@@ -1474,22 +1488,7 @@
             Helper method to check whether the given object is Delta resource set.
             </summary>
             <param name="result">The given object.</param>
-            <returns>True/False.</returns>
-        </member>
-        <member name="T:Microsoft.AspNetCore.OData.Deltas.DeltaItemKind">
-            <summary>
-            The Kind of the object within the DeltaPayload used to distinguish between
-            Resource/DeletedResource/DeltaDeletedLink/AddedLink.
-            </summary>
-        </member>
-        <member name="F:Microsoft.AspNetCore.OData.Deltas.DeltaItemKind.Resource">
-            <summary>
-            Corresponds to EdmEntityObject (Equivalent of ODataResource in ODL).
-            </summary>
-        </member>
-        <member name="F:Microsoft.AspNetCore.OData.Deltas.DeltaItemKind.DeletedResource">
-            <summary>
-            Corresponds to EdmDeltaDeletedResourceObject (Equivalent of ODataDeletedResource in ODL).
+    Object (Equivalent of ODataDeletedResource in ODL).
             </summary>
         </member>
         <member name="F:Microsoft.AspNetCore.OData.Deltas.DeltaItemKind.DeltaDeletedLink">
@@ -1570,6 +1569,20 @@
         <member name="P:Microsoft.AspNetCore.OData.Deltas.DeltaLink`1.Kind">
             <inheritdoc />
         </member>
+        <member name="T:Microsoft.AspNetCore.OData.Deltas.Delta`1">
+            <summary>
+            A class the tracnew instance of <see cref="T:Microsoft.AspNetCore.OData.Deltas.DeltaLink`1"/>.
+            </summary>
+        </member>
+        <member name="M:Microsoft.AspNetCore.OData.Deltas.DeltaLink`1.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of <see cref="T:Microsoft.AspNetCore.OData.Deltas.DeltaLink`1"/>.
+            </summary>
+            <param name="structuralType">The derived structural type for which the changes would be tracked.</param>
+        </member>
+        <member name="P:Microsoft.AspNetCore.OData.Deltas.DeltaLink`1.Kind">
+            <inheritdoc />
+        </member>
         <member name="T:Microsoft.AspNetCore.OData.Deltas.Delta`1">
             <summary>
             A class the tracks changes (i.e. the Delta) for a particular <typeparamref name="T"/>.
@@ -1624,21 +1637,7 @@
             <summary>
             The list of property names that can be updated.
             </summary>
-            <remarks>When the list is modified, any modified properties that were removed from the list are no longer
-            considered to be changed.</remarks>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.Clear">
-            <inheritdoc/>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.TrySetPropertyValue(System.String,System.Object)">
-            <inheritdoc/>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.TryGetPropertyValue(System.String,System.Object@)">
-            <inheritdoc/>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.TryGetNestedPropertyValue(System.String,System.Object@)">
-            <summary>
-            Attempts to get the value of the nested Property called <paramref name="name"/> from the underlying resource.
+            <remarks>When the list is modified, ttempts to get the value of the nested Property called <paramref name="name"/> from the underlying resource.
             <remarks>
             Only properties that exist on Entity can be retrieved.
             Only modified nested properties can be retrieved.
@@ -1700,6 +1699,19 @@
             </summary>
             <param name="original">The entity to be updated.</param>
         </member>
+        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.TryGetPropertyRef(`0,System.String,System.Object@)">
+            <summary>
+            Attempts to get the property by the specmarks>
+            </summary>
+            <param name="original">The entity to be updated.</param>
+        </member>
+        <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.Put(`0)">
+            <summary>
+            Overwrites the <paramref name="original"/> entity with the values stored in this Delta.
+            <remarks>The semantics of this operation are equivalent to a HTTP PUT operation, hence the name.</remarks>
+            </summary>
+            <param name="original">The entity to be updated.</param>
+        </member>
         <member name="M:Microsoft.AspNetCore.OData.Deltas.Delta`1.TryGetPropertyRef(`0,System.String,System.Object@)">
             <summary>
             Attempts to get the property by the specified name.
@@ -2657,16 +2669,7 @@
             This is how formatters create links to invoke bound actions or functions.
             </summary>
         </member>
-        <member name="M:Microsoft.AspNetCore.OData.Edm.OperationLinkBuilder.#ctor(System.Func{Microsoft.AspNetCore.OData.Formatter.ResourceContext,System.Uri},System.Boolean)">
-            <summary>
-            Create a new <see cref="T:Microsoft.AspNetCore.OData.Edm.OperationLinkBuilder"/> based on an entity link factory.
-            </summary>
-            <param name="linkFactory">The link factory this <see cref="T:Microsoft.AspNetCore.OData.Edm.OperationLinkBuilder"/> should use when building links.</param>
-            <param name="followsConventions">
-            A value indicating whether the link factory generates links that follow OData conventions.
-            </param>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Edm.OperationLinkBuilder.#ctor(System.Func{Microsoft.AspNetCore.OData.Formatter.ResourceSetContext,System.Uri},System.Boolean)">
+        <member n.OperationLinkBuilder.#ctor(System.Func{Microsoft.AspNetCore.OData.Formatter.ResourceSetContext,System.Uri},System.Boolean)">
             <summary>
             Create a new <see cref="T:Microsoft.AspNetCore.OData.Edm.OperationLinkBuilder"/> based on a feed link factory.
             </summary>
@@ -7978,6 +7981,18 @@
             Enables a controller action to support OData query parameters.
             </summary>
         </member>
+        <member name="P:Microsoft.AspNetCore.OData.Query.EnableQueryAttribute.EnsureStableOrdering">
+            <summary>
+            Gets or sets a value indicating whether query composition should
+            alter the original query when necessary to ensure a stable sort order.
+            </summary>
+            <value>A <c>true</c> value indicates the original query should
+            be modified when necessary to guarantee a stable sort order.
+            A <c>false</c> value indicates the sort order can be considered
+            stable without modifying the query.  Query providers that ensure
+            a stable sort order shoa controller action to support OData query parameters.
+            </summary>
+        </member>
         <member name="P:Microsoft.AspNetCore.OData.Query.EnableQueryAttribute.EnsureStableOrdering">
             <summary>
             Gets or sets a value indicating whether query composition should
@@ -10342,19 +10357,7 @@
         </member>
         <member name="M:Microsoft.AspNetCore.OData.Query.ParameterAliasNodeTranslator.Visit(Microsoft.OData.UriParser.SingleNavigationNode)">
             <summary>
-            Translate a SingleNavigationNode.
-            </summary>
-            <param name="nodeIn">The node to be translated.</param>
-            <returns>The translated node.</returns>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Query.ParameterAliasNodeTranslator.Visit(Microsoft.OData.UriParser.SingleValueFunctionCallNode)">
-            <summary>
-            Translate a SingleValueFunctionCallNode.
-            </summary>
-            <param name="nodeIn">The node to be translated.</param>
-            <returns>The translated node.</returns>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Query.ParameterAliasNodeTranslator.Visit(Microsoft.OData.UriParser.SingleValueOpenPropertyAccessNode)">
+      ">
             <summary>
             Translate a SingleValueOpenPropertyAccessNode.
             </summary>
@@ -10420,6 +10423,18 @@
             </summary>
             <param name="context">The filter context.</param>
         </member>
+        <member name="M:Microsoft.AspNetCore.OData.Query.QueryFilterProvider.OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext)">
+            <summary>
+            Summary:
+            Called in decreasing Microsoft.AspNetCore.Mvc.Filters.IFilterProvider.Order,
+            after all Microsoft.AspNetCore.Mvc.Filters.IFilterProviders have executed once.
+            </summary>
+            <param name="context">The Mica.Query.QueryFilterProvider.OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext)">
+            <summary>
+            Provides filters to apply to the specified action.
+            </summary>
+            <param name="context">The filter context.</param>
+        </member>
         <member name="M:Microsoft.AspNetCore.OData.Query.QueryFilterProvider.OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext)">
             <summary>
             Summary:
@@ -10539,21 +10554,7 @@
             <summary>
             Gets the raw $count value.
             </summary>
-        </member>
-        <member name="P:Microsoft.AspNetCore.OData.Query.CountQueryOption.Value">
-            <summary>
-            Gets the value of the $count in a parsed form.
-            </summary>
-        </member>
-        <member name="P:Microsoft.AspNetCore.OData.Query.CountQueryOption.Validator">
-            <summary>
-            Gets or sets the $count query validator.
-            </summary>
-        </member>
-        <member name="M:Microsoft.AspNetCore.OData.Query.CountQueryOption.Validate(Microsoft.AspNetCore.OData.Query.Validator.ODataValidationSettings)">
-            <summary>
-            Validate the count query based on the given <paramref name="validationSettings"/>.
-            It throws an ODataException if validation failed.
+ validation failed.
             </summary>
             <param name="validationSettings">The <see cref="T:Microsoft.AspNetCore.OData.Query.Validator.ODataValidationSettings"/> instance
             which contains all the validation settings.</param>
@@ -11589,6 +11590,20 @@
              Gets a list of properties one can orderby the result with. Note, by default this list is empty,
              it means it can be ordered by any property.
             
+             For example, having an empty col: any, all
+            
+             </summary>
+        </member>
+        <member name="P:Microsoft.AspNetCore.OData.Query.Validator.ODataValidationSettings.AllowedLogicalOperators">
+            <summary>
+            Gets or sets a list of allowed logical operators such as 'eq', 'ne', 'gt', 'ge', 'lt', 'le', 'and', 'or', 'not'.
+            </summary>
+        </member>
+        <member name="P:Microsoft.AspNetCore.OData.Query.Validator.ODataValidationSettings.AllowedOrderByProperties">
+             <summary>
+             Gets a list of properties one can orderby the result with. Note, by default this list is empty,
+             it means it can be ordered by any property.
+            
              For example, having an empty collection means client can order the queryable result by any properties.
              Adding "Name" to this list means that it only allows queryable result to be ordered by Name property.
              </summary>