diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 0761b4d4..234c835a 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -20,6 +20,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Setup pandoc
+        uses: nikeee/setup-pandoc@v1
+        with:
+          pandoc-version: 3.1.12.2
       - name: npm install, build, and test
         run: |
           npm ci
diff --git a/lib/README.md b/lib/README.md
index da94a6c4..1c2a270e 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -65,8 +65,9 @@ If you use [Visual Studio Code](https://code.visualstudio.com/), you can [run th
 
 You should also install the recommended extension for [XML Language Support by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-xml). It will validate the XML files against the official [OData CDSL XML schemas](https://github.com/oasis-tcs/odata-csdl-schemas/tree/main/schemas).
 
-`npm run pages` builds pages that can be deployed to github.io. To test these pages locally,
-run `npm run serve-pages`.
+`npm run pages` builds pages that can be deployed to github.io. It needs a local installation of
+[Pandoc](https://pandoc.org/), version 3.1.12.2 or higher.
+To test the built pages locally, run `npm run serve-pages`.
 
 Node.js packages with a dependency on `odata-vocabularies` can inherit the page building functionality
 by including the following in their `package.json`:
diff --git a/lib/csdl2markdown.js b/lib/csdl2markdown.js
index 589b4c4f..66997c1e 100644
--- a/lib/csdl2markdown.js
+++ b/lib/csdl2markdown.js
@@ -1,3 +1,5 @@
+const { spawnSync } = require("child_process");
+
 /**
  * Converts OData CSDL JSON to Github Flavored Markdown
  *
@@ -659,12 +661,21 @@ module.exports.csdl2markdown = function (filename, csdl, referenced = {}) {
    * @return {string} Escaped text
    */
   function escape(text) {
-    return (text || "")
-      .trim()
-      .replace(/\n\n/g, "<br/>")
-      .replace(/\n/g, " ")
-      .replace(/[ \t]+/g, " ")
-      .replace(/\|/g, "\\|");
+    if (text && /(?<=^|\n)([-+*]|\d+\.) /.test(text))
+      return spawnSync(
+        "pandoc",
+        ["-f", "gfm+tex_math_dollars", "-t", "html", "--mathjax", "--eol=lf"],
+        { input: text },
+      )
+        .stdout.toString()
+        .replaceAll("\n", " ");
+    else
+      return (text || "")
+        .trim()
+        .replace(/\n\n/g, "<br/>")
+        .replace(/\n/g, " ")
+        .replace(/[ \t]+/g, " ")
+        .replace(/\|/g, "\\|");
   }
 
   /**
diff --git a/vocabularies/Org.OData.Aggregation.V1.json b/vocabularies/Org.OData.Aggregation.V1.json
index 89d59202..59a7a024 100644
--- a/vocabularies/Org.OData.Aggregation.V1.json
+++ b/vocabularies/Org.OData.Aggregation.V1.json
@@ -62,7 +62,7 @@
                 "EntityContainer"
             ],
             "@Core.Description": "Default support of the `$apply` system query option for all collection-valued resources in the container",
-            "@Core.LongDescription": "Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:\n\n- Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`\n\n- Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively\n\n- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value\n          "
+            "@Core.LongDescription": "Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:\n- Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`\n- Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively\n- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value"
         },
         "ApplySupportedBase": {
             "$Kind": "ComplexType",
diff --git a/vocabularies/Org.OData.Aggregation.V1.md b/vocabularies/Org.OData.Aggregation.V1.md
index b8c494e4..f39dc5fc 100644
--- a/vocabularies/Org.OData.Aggregation.V1.md
+++ b/vocabularies/Org.OData.Aggregation.V1.md
@@ -11,21 +11,21 @@ Related to the specification document [OData-Data-Agg-v4.0](http://docs.oasis-op
 Term|Type|Description
 :---|:---|:----------
 [ApplySupported](./Org.OData.Aggregation.V1.xml#L82:~:text=<Term%20Name="-,ApplySupported,-")|[ApplySupportedType](#ApplySupportedType)|<a name="ApplySupported"></a>This entity set or collection supports the `$apply` system query option
-[ApplySupportedDefaults](./Org.OData.Aggregation.V1.xml#L88:~:text=<Term%20Name="-,ApplySupportedDefaults,-")|[ApplySupportedBase](#ApplySupportedBase)|<a name="ApplySupportedDefaults"></a>Default support of the `$apply` system query option for all collection-valued resources in the container<br>Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:<br/>- Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`<br/>- Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively<br/>- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value
-[Groupable](./Org.OData.Aggregation.V1.xml#L309:~:text=<Term%20Name="-,Groupable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Groupable"></a>Deprecated in favor of [`ApplySupported/GroupableProperties`](#ApplySupported)
-[Aggregatable](./Org.OData.Aggregation.V1.xml#L321:~:text=<Term%20Name="-,Aggregatable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Aggregatable"></a>Deprecated in favor of [`ApplySupported/AggregatableProperties`](#ApplySupported)
-[CustomAggregate](./Org.OData.Aggregation.V1.xml#L333:~:text=<Term%20Name="-,CustomAggregate,-")|String|<a name="CustomAggregate"></a>Dynamic property that can be used in the `aggregate` transformation<br>This term MUST be applied with a Qualifier, the Qualifier value is the name of the dynamic property. The value of the annotation MUST be the qualified name of a primitive type. The aggregated value will be of that type.
-[ContextDefiningProperties](./Org.OData.Aggregation.V1.xml#L339:~:text=<Term%20Name="-,ContextDefiningProperties,-")|\[PropertyPath\]|<a name="ContextDefiningProperties"></a>The annotated property or custom aggregate is only well-defined in the context of these properties<br>The context-defining properties need either be part of the result entities, or be restricted to a single value by a pre-filter operation. Examples are postal codes within a country, or monetary amounts whose context is the unit of currency.
-[LeveledHierarchy](./Org.OData.Aggregation.V1.xml#L346:~:text=<Term%20Name="-,LeveledHierarchy,-")|\[PropertyPath\]|<a name="LeveledHierarchy"></a>Defines a leveled hierarchy (OData-Data-Agg-v4.0, section 5.5.1)
-[RecursiveHierarchy](./Org.OData.Aggregation.V1.xml#L350:~:text=<Term%20Name="-,RecursiveHierarchy,-")|[RecursiveHierarchyType](#RecursiveHierarchyType)|<a name="RecursiveHierarchy"></a>Defines a recursive hierarchy (OData-Data-Agg-v4.0, section 5.5.2)
-[UpPath](./Org.OData.Aggregation.V1.xml#L523:~:text=<Term%20Name="-,UpPath,-")|\[String\]|<a name="UpPath"></a>The string values of the node identifiers in a path from the annotated node to a start node in a traversal of a recursive hierarchy<br>This instance annotation occurs in the result set after a `traverse` transformation (OData-Data-Agg-v4.0, section 6.2.2.2). A use case for this is traversal with multiple parents, when this annotation takes as value one parent node identifier followed by one grandparent node identifier and so on.
-[AvailableOnAggregates](./Org.OData.Aggregation.V1.xml#L532:~:text=<Term%20Name="-,AvailableOnAggregates,-")|[AvailableOnAggregatesType](#AvailableOnAggregatesType)|<a name="AvailableOnAggregates"></a>This function is available on aggregated entities if the `RequiredProperties` are still defined
+[ApplySupportedDefaults](./Org.OData.Aggregation.V1.xml#L88:~:text=<Term%20Name="-,ApplySupportedDefaults,-")|[ApplySupportedBase](#ApplySupportedBase)|<a name="ApplySupportedDefaults"></a>Default support of the `$apply` system query option for all collection-valued resources in the container<br><p>Annotating term <a href="#ApplySupported"><code>ApplySupported</code></a> for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:</p> <ul> <li>Primitive or collection-valued properties specified in <code>ApplySupported</code> replace the corresponding properties specified in <code>ApplySupportedDefaults</code></li> <li>Complex-valued properties specified in <code>ApplySupported</code> override the corresponding properties specified in <code>ApplySupportedDefaults</code> using PATCH semantics recursively</li> <li>Properties specified neither in <code>ApplySupported</code> nor in <code>ApplySupportedDefaults</code> have their default value</li> </ul> 
+[Groupable](./Org.OData.Aggregation.V1.xml#L305:~:text=<Term%20Name="-,Groupable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Groupable"></a>Deprecated in favor of [`ApplySupported/GroupableProperties`](#ApplySupported)
+[Aggregatable](./Org.OData.Aggregation.V1.xml#L317:~:text=<Term%20Name="-,Aggregatable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Aggregatable"></a>Deprecated in favor of [`ApplySupported/AggregatableProperties`](#ApplySupported)
+[CustomAggregate](./Org.OData.Aggregation.V1.xml#L329:~:text=<Term%20Name="-,CustomAggregate,-")|String|<a name="CustomAggregate"></a>Dynamic property that can be used in the `aggregate` transformation<br>This term MUST be applied with a Qualifier, the Qualifier value is the name of the dynamic property. The value of the annotation MUST be the qualified name of a primitive type. The aggregated value will be of that type.
+[ContextDefiningProperties](./Org.OData.Aggregation.V1.xml#L335:~:text=<Term%20Name="-,ContextDefiningProperties,-")|\[PropertyPath\]|<a name="ContextDefiningProperties"></a>The annotated property or custom aggregate is only well-defined in the context of these properties<br>The context-defining properties need either be part of the result entities, or be restricted to a single value by a pre-filter operation. Examples are postal codes within a country, or monetary amounts whose context is the unit of currency.
+[LeveledHierarchy](./Org.OData.Aggregation.V1.xml#L342:~:text=<Term%20Name="-,LeveledHierarchy,-")|\[PropertyPath\]|<a name="LeveledHierarchy"></a>Defines a leveled hierarchy (OData-Data-Agg-v4.0, section 5.5.1)
+[RecursiveHierarchy](./Org.OData.Aggregation.V1.xml#L346:~:text=<Term%20Name="-,RecursiveHierarchy,-")|[RecursiveHierarchyType](#RecursiveHierarchyType)|<a name="RecursiveHierarchy"></a>Defines a recursive hierarchy (OData-Data-Agg-v4.0, section 5.5.2)
+[UpPath](./Org.OData.Aggregation.V1.xml#L519:~:text=<Term%20Name="-,UpPath,-")|\[String\]|<a name="UpPath"></a>The string values of the node identifiers in a path from the annotated node to a start node in a traversal of a recursive hierarchy<br>This instance annotation occurs in the result set after a `traverse` transformation (OData-Data-Agg-v4.0, section 6.2.2.2). A use case for this is traversal with multiple parents, when this annotation takes as value one parent node identifier followed by one grandparent node identifier and so on.
+[AvailableOnAggregates](./Org.OData.Aggregation.V1.xml#L528:~:text=<Term%20Name="-,AvailableOnAggregates,-")|[AvailableOnAggregatesType](#AvailableOnAggregatesType)|<a name="AvailableOnAggregates"></a>This function is available on aggregated entities if the `RequiredProperties` are still defined
 
 
 ## Functions
 
 <a name="isnode"></a>
-### [isnode](./Org.OData.Aggregation.V1.xml#L375:~:text=<Function%20Name="-,isnode,-")
+### [isnode](./Org.OData.Aggregation.V1.xml#L371:~:text=<Function%20Name="-,isnode,-")
 
 Is the entity a node of the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`)? (See OData-Data-Agg-v4.0, section 5.5.2.1)
 
@@ -33,14 +33,14 @@ If a node identifier passed to the function is null, the function returns null.
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L378:~:text=<Function%20Name="-,isnode,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L381:~:text=<Function%20Name="-,isnode,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L382:~:text=<Function%20Name="-,isnode,-")|PrimitiveType?|Node identifier of the putative node
-[&rarr;](./Org.OData.Aggregation.V1.xml#L385:~:text=<Function%20Name="-,isnode,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L374:~:text=<Function%20Name="-,isnode,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L377:~:text=<Function%20Name="-,isnode,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L378:~:text=<Function%20Name="-,isnode,-")|PrimitiveType?|Node identifier of the putative node
+[&rarr;](./Org.OData.Aggregation.V1.xml#L381:~:text=<Function%20Name="-,isnode,-")|Boolean?|
 
 
 <a name="isroot"></a>
-### [isroot](./Org.OData.Aggregation.V1.xml#L388:~:text=<Function%20Name="-,isroot,-")
+### [isroot](./Org.OData.Aggregation.V1.xml#L384:~:text=<Function%20Name="-,isroot,-")
 
 Is the entity a root node of the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`)?
 
@@ -48,14 +48,14 @@ If a node identifier passed to the function is null, the function returns null.
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L391:~:text=<Function%20Name="-,isroot,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L394:~:text=<Function%20Name="-,isroot,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L395:~:text=<Function%20Name="-,isroot,-")|PrimitiveType?|Node identifier of the putative root
-[&rarr;](./Org.OData.Aggregation.V1.xml#L398:~:text=<Function%20Name="-,isroot,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L387:~:text=<Function%20Name="-,isroot,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L390:~:text=<Function%20Name="-,isroot,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L391:~:text=<Function%20Name="-,isroot,-")|PrimitiveType?|Node identifier of the putative root
+[&rarr;](./Org.OData.Aggregation.V1.xml#L394:~:text=<Function%20Name="-,isroot,-")|Boolean?|
 
 
 <a name="isdescendant"></a>
-### [isdescendant](./Org.OData.Aggregation.V1.xml#L401:~:text=<Function%20Name="-,isdescendant,-")
+### [isdescendant](./Org.OData.Aggregation.V1.xml#L397:~:text=<Function%20Name="-,isdescendant,-")
 
 Is the entity a descendant node of the ancestor node in the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`) with at most the specified distance? (See OData-Data-Agg-v4.0, section 5.5.2.1)
 
@@ -63,17 +63,17 @@ If a node identifier passed to the function is null, the function returns null.
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L404:~:text=<Function%20Name="-,isdescendant,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L407:~:text=<Function%20Name="-,isdescendant,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L408:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType?|Node identifier of the putative descendant
-[Ancestor](./Org.OData.Aggregation.V1.xml#L411:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType?|Node identifier of the ancestor node
-*[MaxDistance](./Org.OData.Aggregation.V1.xml#L414:~:text=<Function%20Name="-,isdescendant,-")*|Int16|*Optional parameter*
-*[IncludeSelf](./Org.OData.Aggregation.V1.xml#L422:~:text=<Function%20Name="-,isdescendant,-")*|Boolean|*Optional parameter:* Whether to include the node itself in the result
-[&rarr;](./Org.OData.Aggregation.V1.xml#L430:~:text=<Function%20Name="-,isdescendant,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L400:~:text=<Function%20Name="-,isdescendant,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L403:~:text=<Function%20Name="-,isdescendant,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L404:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType?|Node identifier of the putative descendant
+[Ancestor](./Org.OData.Aggregation.V1.xml#L407:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType?|Node identifier of the ancestor node
+*[MaxDistance](./Org.OData.Aggregation.V1.xml#L410:~:text=<Function%20Name="-,isdescendant,-")*|Int16|*Optional parameter*
+*[IncludeSelf](./Org.OData.Aggregation.V1.xml#L418:~:text=<Function%20Name="-,isdescendant,-")*|Boolean|*Optional parameter:* Whether to include the node itself in the result
+[&rarr;](./Org.OData.Aggregation.V1.xml#L426:~:text=<Function%20Name="-,isdescendant,-")|Boolean?|
 
 
 <a name="isancestor"></a>
-### [isancestor](./Org.OData.Aggregation.V1.xml#L433:~:text=<Function%20Name="-,isancestor,-")
+### [isancestor](./Org.OData.Aggregation.V1.xml#L429:~:text=<Function%20Name="-,isancestor,-")
 
 Is the entity an ancestor node of the descendant node in the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`) with at most the specified distance? (See OData-Data-Agg-v4.0, section 5.5.2.1)
 
@@ -81,17 +81,17 @@ If a node identifier passed to the function is null, the function returns null.
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L436:~:text=<Function%20Name="-,isancestor,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L439:~:text=<Function%20Name="-,isancestor,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L440:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType?|Node identifier of the putative ancestor
-[Descendant](./Org.OData.Aggregation.V1.xml#L443:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType?|Node identifier of the descendant node
-*[MaxDistance](./Org.OData.Aggregation.V1.xml#L446:~:text=<Function%20Name="-,isancestor,-")*|Int16|*Optional parameter*
-*[IncludeSelf](./Org.OData.Aggregation.V1.xml#L454:~:text=<Function%20Name="-,isancestor,-")*|Boolean|*Optional parameter:* Whether to include the node itself in the result
-[&rarr;](./Org.OData.Aggregation.V1.xml#L462:~:text=<Function%20Name="-,isancestor,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L432:~:text=<Function%20Name="-,isancestor,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L435:~:text=<Function%20Name="-,isancestor,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L436:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType?|Node identifier of the putative ancestor
+[Descendant](./Org.OData.Aggregation.V1.xml#L439:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType?|Node identifier of the descendant node
+*[MaxDistance](./Org.OData.Aggregation.V1.xml#L442:~:text=<Function%20Name="-,isancestor,-")*|Int16|*Optional parameter*
+*[IncludeSelf](./Org.OData.Aggregation.V1.xml#L450:~:text=<Function%20Name="-,isancestor,-")*|Boolean|*Optional parameter:* Whether to include the node itself in the result
+[&rarr;](./Org.OData.Aggregation.V1.xml#L458:~:text=<Function%20Name="-,isancestor,-")|Boolean?|
 
 
 <a name="issibling"></a>
-### [issibling](./Org.OData.Aggregation.V1.xml#L465:~:text=<Function%20Name="-,issibling,-")
+### [issibling](./Org.OData.Aggregation.V1.xml#L461:~:text=<Function%20Name="-,issibling,-")
 
 Is the entity a sibling node of the other node in the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`)? (See OData-Data-Agg-v4.0, section 5.5.2.1)
 
@@ -99,15 +99,15 @@ A node is not a sibling of itself. If a node identifier passed to the function i
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L468:~:text=<Function%20Name="-,issibling,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L471:~:text=<Function%20Name="-,issibling,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L472:~:text=<Function%20Name="-,issibling,-")|PrimitiveType?|Node identifier of the putative sibling
-[Other](./Org.OData.Aggregation.V1.xml#L475:~:text=<Function%20Name="-,issibling,-")|PrimitiveType?|Node identifier of the other node
-[&rarr;](./Org.OData.Aggregation.V1.xml#L478:~:text=<Function%20Name="-,issibling,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L464:~:text=<Function%20Name="-,issibling,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L467:~:text=<Function%20Name="-,issibling,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L468:~:text=<Function%20Name="-,issibling,-")|PrimitiveType?|Node identifier of the putative sibling
+[Other](./Org.OData.Aggregation.V1.xml#L471:~:text=<Function%20Name="-,issibling,-")|PrimitiveType?|Node identifier of the other node
+[&rarr;](./Org.OData.Aggregation.V1.xml#L474:~:text=<Function%20Name="-,issibling,-")|Boolean?|
 
 
 <a name="isleaf"></a>
-### [isleaf](./Org.OData.Aggregation.V1.xml#L481:~:text=<Function%20Name="-,isleaf,-")
+### [isleaf](./Org.OData.Aggregation.V1.xml#L477:~:text=<Function%20Name="-,isleaf,-")
 
 Is the entity a leaf node in the hierarchy specified by the [parameter pair](#HierarchyQualifier) (`HierarchyNodes`, `HierarchyQualifier`)? (See OData-Data-Agg-v4.0, section 5.5.2.1)
 
@@ -115,14 +115,14 @@ If a node identifier passed to the function is null, the function returns null.
 
 Parameter|Type|Description
 :--------|:---|:----------
-[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L484:~:text=<Function%20Name="-,isleaf,-")|\[EntityType\]|A collection, given through a `$root` expression
-[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L487:~:text=<Function%20Name="-,isleaf,-")|[HierarchyQualifier](#HierarchyQualifier)|
-[Node](./Org.OData.Aggregation.V1.xml#L488:~:text=<Function%20Name="-,isleaf,-")|PrimitiveType?|Node identifier of the putative leaf
-[&rarr;](./Org.OData.Aggregation.V1.xml#L491:~:text=<Function%20Name="-,isleaf,-")|Boolean?|
+[HierarchyNodes](./Org.OData.Aggregation.V1.xml#L480:~:text=<Function%20Name="-,isleaf,-")|\[EntityType\]|A collection, given through a `$root` expression
+[HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L483:~:text=<Function%20Name="-,isleaf,-")|[HierarchyQualifier](#HierarchyQualifier)|
+[Node](./Org.OData.Aggregation.V1.xml#L484:~:text=<Function%20Name="-,isleaf,-")|PrimitiveType?|Node identifier of the putative leaf
+[&rarr;](./Org.OData.Aggregation.V1.xml#L487:~:text=<Function%20Name="-,isleaf,-")|Boolean?|
 
 
 <a name="rollupnode"></a>
-### [rollupnode](./Org.OData.Aggregation.V1.xml#L494:~:text=<Function%20Name="-,rollupnode,-")
+### [rollupnode](./Org.OData.Aggregation.V1.xml#L490:~:text=<Function%20Name="-,rollupnode,-")
 
 During `rolluprecursive` for a hierarchy node, this function returns the node
 
@@ -136,12 +136,12 @@ constructs a rollup that contains aggregates per hierarchy node while excluding
 
 Parameter|Type|Description
 :--------|:---|:----------
-*[Position](./Org.OData.Aggregation.V1.xml#L505:~:text=<Function%20Name="-,rollupnode,-")*|Int16|*Optional parameter:* Position N among the `rolluprecursive` operators in the first argument of `groupby`<br>Every instance in the output set of a `groupby` transformation with M `rolluprecursive` operators has M relationships to M nodes in M recursive hierarchies. This function returns the node x with path r to the root in relationship number N. If several such `groupby` transformations are nested, this function refers to the innermost one.
-[&rarr;](./Org.OData.Aggregation.V1.xml#L520:~:text=<Function%20Name="-,rollupnode,-")|EntityType|
+*[Position](./Org.OData.Aggregation.V1.xml#L501:~:text=<Function%20Name="-,rollupnode,-")*|Int16|*Optional parameter:* Position N among the `rolluprecursive` operators in the first argument of `groupby`<br>Every instance in the output set of a `groupby` transformation with M `rolluprecursive` operators has M relationships to M nodes in M recursive hierarchies. This function returns the node x with path r to the root in relationship number N. If several such `groupby` transformations are nested, this function refers to the innermost one.
+[&rarr;](./Org.OData.Aggregation.V1.xml#L516:~:text=<Function%20Name="-,rollupnode,-")|EntityType|
 
 
 <a name="ApplySupportedBase"></a>
-## [ApplySupportedBase](./Org.OData.Aggregation.V1.xml#L103:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")
+## [ApplySupportedBase](./Org.OData.Aggregation.V1.xml#L99:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")
 
 
 Services that do not fully implement a certain aggregation-related functionality may document
@@ -153,69 +153,69 @@ Services that do not fully implement a certain aggregation-related functionality
 
 Property|Type|Description
 :-------|:---|:----------
-[Transformations](./Org.OData.Aggregation.V1.xml#L109:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[[Transformation](#Transformation)\]|Transformations that can be used in `$apply`
-[CustomAggregationMethods](./Org.OData.Aggregation.V1.xml#L112:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
-[Rollup](./Org.OData.Aggregation.V1.xml#L115:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
-[From](./Org.OData.Aggregation.V1.xml#L118:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|Boolean|The service supports the `from` keyword in an `aggregate` transformation
+[Transformations](./Org.OData.Aggregation.V1.xml#L105:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[[Transformation](#Transformation)\]|Transformations that can be used in `$apply`
+[CustomAggregationMethods](./Org.OData.Aggregation.V1.xml#L108:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
+[Rollup](./Org.OData.Aggregation.V1.xml#L111:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
+[From](./Org.OData.Aggregation.V1.xml#L114:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|Boolean|The service supports the `from` keyword in an `aggregate` transformation
 
 <a name="ApplySupportedType"></a>
-## [ApplySupportedType](./Org.OData.Aggregation.V1.xml#L122:~:text=<ComplexType%20Name="-,ApplySupportedType,-"): [ApplySupportedBase](#ApplySupportedBase)
+## [ApplySupportedType](./Org.OData.Aggregation.V1.xml#L118:~:text=<ComplexType%20Name="-,ApplySupportedType,-"): [ApplySupportedBase](#ApplySupportedBase)
 
 
 Property|Type|Description
 :-------|:---|:----------
-[*Transformations*](./Org.OData.Aggregation.V1.xml#L109:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[[Transformation](#Transformation)\]|Transformations that can be used in `$apply`
-[*CustomAggregationMethods*](./Org.OData.Aggregation.V1.xml#L112:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
-[*Rollup*](./Org.OData.Aggregation.V1.xml#L115:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
-[*From*](./Org.OData.Aggregation.V1.xml#L118:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|Boolean|The service supports the `from` keyword in an `aggregate` transformation
-[PropertyRestrictions](./Org.OData.Aggregation.V1.xml#L123:~:text=<ComplexType%20Name="-,ApplySupportedType,-") *(Deprecated)*|Boolean|Deprecated since [`Groupable`](#Groupable) and [`Aggregatable`](#Aggregatable) are deprecated
-[GroupableProperties](./Org.OData.Aggregation.V1.xml#L134:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[AnyPropertyPath\]|A non-empty collection indicates that only the listed properties of the annotated target are supported by the `groupby` transformation
-[AggregatableProperties](./Org.OData.Aggregation.V1.xml#L137:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[[AggregatablePropertyType](#AggregatablePropertyType)\]|A non-empty collection indicates that only the listed properties of the annotated target can be used in the `aggregate` transformation, optionally restricted to the specified aggregation methods
+[*Transformations*](./Org.OData.Aggregation.V1.xml#L105:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[[Transformation](#Transformation)\]|Transformations that can be used in `$apply`
+[*CustomAggregationMethods*](./Org.OData.Aggregation.V1.xml#L108:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
+[*Rollup*](./Org.OData.Aggregation.V1.xml#L111:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
+[*From*](./Org.OData.Aggregation.V1.xml#L114:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|Boolean|The service supports the `from` keyword in an `aggregate` transformation
+[PropertyRestrictions](./Org.OData.Aggregation.V1.xml#L119:~:text=<ComplexType%20Name="-,ApplySupportedType,-") *(Deprecated)*|Boolean|Deprecated since [`Groupable`](#Groupable) and [`Aggregatable`](#Aggregatable) are deprecated
+[GroupableProperties](./Org.OData.Aggregation.V1.xml#L130:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[AnyPropertyPath\]|A non-empty collection indicates that only the listed properties of the annotated target are supported by the `groupby` transformation
+[AggregatableProperties](./Org.OData.Aggregation.V1.xml#L133:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[[AggregatablePropertyType](#AggregatablePropertyType)\]|A non-empty collection indicates that only the listed properties of the annotated target can be used in the `aggregate` transformation, optionally restricted to the specified aggregation methods
 
 <a name="AggregatablePropertyType"></a>
-## [AggregatablePropertyType](./Org.OData.Aggregation.V1.xml#L141:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")
+## [AggregatablePropertyType](./Org.OData.Aggregation.V1.xml#L137:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[Property](./Org.OData.Aggregation.V1.xml#L142:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|PropertyPath|Aggregatable property
-[SupportedAggregationMethods](./Org.OData.Aggregation.V1.xml#L147:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|\[[AggregationMethod](#AggregationMethod)\]|Standard and custom aggregation methods that can be applied to the property. If omitted, all aggregation methods can be applied
-[RecommendedAggregationMethod](./Org.OData.Aggregation.V1.xml#L152:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|[AggregationMethod?](#AggregationMethod)|Recommended method for aggregating values of the property
+[Property](./Org.OData.Aggregation.V1.xml#L138:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|PropertyPath|Aggregatable property
+[SupportedAggregationMethods](./Org.OData.Aggregation.V1.xml#L143:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|\[[AggregationMethod](#AggregationMethod)\]|Standard and custom aggregation methods that can be applied to the property. If omitted, all aggregation methods can be applied
+[RecommendedAggregationMethod](./Org.OData.Aggregation.V1.xml#L148:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|[AggregationMethod?](#AggregationMethod)|Recommended method for aggregating values of the property
 
 <a name="Transformation"></a>
-## [Transformation](./Org.OData.Aggregation.V1.xml#L159:~:text=<TypeDefinition%20Name="-,Transformation,-")
+## [Transformation](./Org.OData.Aggregation.V1.xml#L155:~:text=<TypeDefinition%20Name="-,Transformation,-")
 **Type:** String
 
 A transformation that can be used in `$apply`
 
 Allowed Value|Description
 :------------|:----------
-[aggregate](./Org.OData.Aggregation.V1.xml#L163:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.1
-[groupby](./Org.OData.Aggregation.V1.xml#L167:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.3
-[concat](./Org.OData.Aggregation.V1.xml#L171:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.2
-[identity](./Org.OData.Aggregation.V1.xml#L175:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.1
-[filter](./Org.OData.Aggregation.V1.xml#L179:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.2
-[search](./Org.OData.Aggregation.V1.xml#L183:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.4
-[nest](./Org.OData.Aggregation.V1.xml#L187:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.2
-[addnested](./Org.OData.Aggregation.V1.xml#L191:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.3
-[join](./Org.OData.Aggregation.V1.xml#L195:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.1
-[outerjoin](./Org.OData.Aggregation.V1.xml#L199:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.1
-[compute](./Org.OData.Aggregation.V1.xml#L203:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.2
-[bottomcount](./Org.OData.Aggregation.V1.xml#L207:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.1
-[bottomsum](./Org.OData.Aggregation.V1.xml#L211:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.3
-[bottompercent](./Org.OData.Aggregation.V1.xml#L215:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.2
-[topcount](./Org.OData.Aggregation.V1.xml#L219:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.1
-[topsum](./Org.OData.Aggregation.V1.xml#L223:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.3
-[toppercent](./Org.OData.Aggregation.V1.xml#L227:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.2
-[orderby](./Org.OData.Aggregation.V1.xml#L231:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.3
-[top](./Org.OData.Aggregation.V1.xml#L235:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.6
-[skip](./Org.OData.Aggregation.V1.xml#L239:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.5
-[ancestors](./Org.OData.Aggregation.V1.xml#L243:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.1
-[descendants](./Org.OData.Aggregation.V1.xml#L247:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.1
-[traverse](./Org.OData.Aggregation.V1.xml#L251:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.2
+[aggregate](./Org.OData.Aggregation.V1.xml#L159:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.1
+[groupby](./Org.OData.Aggregation.V1.xml#L163:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.3
+[concat](./Org.OData.Aggregation.V1.xml#L167:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.2.2
+[identity](./Org.OData.Aggregation.V1.xml#L171:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.1
+[filter](./Org.OData.Aggregation.V1.xml#L175:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.2
+[search](./Org.OData.Aggregation.V1.xml#L179:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.4
+[nest](./Org.OData.Aggregation.V1.xml#L183:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.2
+[addnested](./Org.OData.Aggregation.V1.xml#L187:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.3
+[join](./Org.OData.Aggregation.V1.xml#L191:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.1
+[outerjoin](./Org.OData.Aggregation.V1.xml#L195:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.5.1
+[compute](./Org.OData.Aggregation.V1.xml#L199:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.4.2
+[bottomcount](./Org.OData.Aggregation.V1.xml#L203:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.1
+[bottomsum](./Org.OData.Aggregation.V1.xml#L207:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.3
+[bottompercent](./Org.OData.Aggregation.V1.xml#L211:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.2
+[topcount](./Org.OData.Aggregation.V1.xml#L215:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.1
+[topsum](./Org.OData.Aggregation.V1.xml#L219:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.3
+[toppercent](./Org.OData.Aggregation.V1.xml#L223:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.1.2
+[orderby](./Org.OData.Aggregation.V1.xml#L227:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.3
+[top](./Org.OData.Aggregation.V1.xml#L231:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.6
+[skip](./Org.OData.Aggregation.V1.xml#L235:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 3.3.5
+[ancestors](./Org.OData.Aggregation.V1.xml#L239:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.1
+[descendants](./Org.OData.Aggregation.V1.xml#L243:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.1
+[traverse](./Org.OData.Aggregation.V1.xml#L247:~:text=<TypeDefinition%20Name="-,Transformation,-")|OData-Data-Agg-v4.0, section 6.2.2
 
 <a name="AggregationMethod"></a>
-## [AggregationMethod](./Org.OData.Aggregation.V1.xml#L259:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")
+## [AggregationMethod](./Org.OData.Aggregation.V1.xml#L255:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")
 **Type:** String
 
 Standard or custom aggregation method
@@ -224,33 +224,33 @@ Custom aggregation methods MUST use a namespace-qualified name, that is contain
 
 Allowed Value|Description
 :------------|:----------
-[sum](./Org.OData.Aggregation.V1.xml#L268:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values, or null if there are no non-null values or the input set is empty
-[min](./Org.OData.Aggregation.V1.xml#L272:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the smallest of the non-null values, or null if there are no non-null values or the input set is empty
-[max](./Org.OData.Aggregation.V1.xml#L276:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the largest of the non-null values, or null if there are no non-null values or the input set is empty
-[average](./Org.OData.Aggregation.V1.xml#L280:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values divided by the count of the non-null values, or null if there are no non-null values or the input set is empty
-[countdistinct](./Org.OData.Aggregation.V1.xml#L284:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Counts the distinct values, omitting any null values<br>For navigation properties, it counts the distinct entities in the union of all entities related to entities in the input set. For collection-valued primitive properties, it counts the distinct items in the union of all collection values in the input set.
+[sum](./Org.OData.Aggregation.V1.xml#L264:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values, or null if there are no non-null values or the input set is empty
+[min](./Org.OData.Aggregation.V1.xml#L268:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the smallest of the non-null values, or null if there are no non-null values or the input set is empty
+[max](./Org.OData.Aggregation.V1.xml#L272:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the largest of the non-null values, or null if there are no non-null values or the input set is empty
+[average](./Org.OData.Aggregation.V1.xml#L276:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values divided by the count of the non-null values, or null if there are no non-null values or the input set is empty
+[countdistinct](./Org.OData.Aggregation.V1.xml#L280:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Counts the distinct values, omitting any null values<br>For navigation properties, it counts the distinct entities in the union of all entities related to entities in the input set. For collection-valued primitive properties, it counts the distinct items in the union of all collection values in the input set.
 
 <a name="RollupType"></a>
-## [RollupType](./Org.OData.Aggregation.V1.xml#L296:~:text=<EnumType%20Name="-,RollupType,-")
+## [RollupType](./Org.OData.Aggregation.V1.xml#L292:~:text=<EnumType%20Name="-,RollupType,-")
 The number of `rollup` or `rolluprecursive` operators allowed in a `groupby` transformation
 
 Member|Value|Description
 :-----|----:|:----------
-[None](./Org.OData.Aggregation.V1.xml#L298:~:text=<EnumType%20Name="-,RollupType,-")|0|No support for `rollup` or `rolluprecursive`
-[SingleHierarchy](./Org.OData.Aggregation.V1.xml#L301:~:text=<EnumType%20Name="-,RollupType,-")|1|Only one `rollup` or `rolluprecursive` operator per `groupby`
-[MultipleHierarchies](./Org.OData.Aggregation.V1.xml#L304:~:text=<EnumType%20Name="-,RollupType,-")|2|Full support for `rollup` and `rolluprecursive`
+[None](./Org.OData.Aggregation.V1.xml#L294:~:text=<EnumType%20Name="-,RollupType,-")|0|No support for `rollup` or `rolluprecursive`
+[SingleHierarchy](./Org.OData.Aggregation.V1.xml#L297:~:text=<EnumType%20Name="-,RollupType,-")|1|Only one `rollup` or `rolluprecursive` operator per `groupby`
+[MultipleHierarchies](./Org.OData.Aggregation.V1.xml#L300:~:text=<EnumType%20Name="-,RollupType,-")|2|Full support for `rollup` and `rolluprecursive`
 
 <a name="RecursiveHierarchyType"></a>
-## [RecursiveHierarchyType](./Org.OData.Aggregation.V1.xml#L354:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")
+## [RecursiveHierarchyType](./Org.OData.Aggregation.V1.xml#L350:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[NodeProperty](./Org.OData.Aggregation.V1.xml#L355:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath|Primitive property holding the node identifier
-[ParentNavigationProperty](./Org.OData.Aggregation.V1.xml#L358:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|NavigationPropertyPath|Property for navigating to the parent node(s). Its type MUST be the entity type annotated with this term, and it MUST be collection-valued or nullable single-valued.
+[NodeProperty](./Org.OData.Aggregation.V1.xml#L351:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath|Primitive property holding the node identifier
+[ParentNavigationProperty](./Org.OData.Aggregation.V1.xml#L354:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|NavigationPropertyPath|Property for navigating to the parent node(s). Its type MUST be the entity type annotated with this term, and it MUST be collection-valued or nullable single-valued.
 
 <a name="HierarchyQualifier"></a>
-## [HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L363:~:text=<TypeDefinition%20Name="-,HierarchyQualifier,-")
+## [HierarchyQualifier](./Org.OData.Aggregation.V1.xml#L359:~:text=<TypeDefinition%20Name="-,HierarchyQualifier,-")
 **Type:** String
 
 Qualifier of a [`RecursiveHierarchy`](#RecursiveHierarchy) annotation
@@ -263,17 +263,17 @@ Every recursive hierarchy function defined in this vocabulary has
 given by the `HierarchyNodes` parameter. This specifies a recursive hierarchy that is evaluated by the function.
 
 <a name="AvailableOnAggregatesType"></a>
-## [AvailableOnAggregatesType](./Org.OData.Aggregation.V1.xml#L535:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")
+## [AvailableOnAggregatesType](./Org.OData.Aggregation.V1.xml#L531:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[RequiredProperties](./Org.OData.Aggregation.V1.xml#L536:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")|\[PropertyPath\]|Properties required to apply this function
+[RequiredProperties](./Org.OData.Aggregation.V1.xml#L532:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")|\[PropertyPath\]|Properties required to apply this function
 
 <a name="NavigationPropertyAggregationCapabilities"></a>
-## [NavigationPropertyAggregationCapabilities](./Org.OData.Aggregation.V1.xml#L541:~:text=<ComplexType%20Name="-,NavigationPropertyAggregationCapabilities,-"): [NavigationPropertyRestriction](Org.OData.Capabilities.V1.md#NavigationPropertyRestriction) *(Deprecated)*
+## [NavigationPropertyAggregationCapabilities](./Org.OData.Aggregation.V1.xml#L537:~:text=<ComplexType%20Name="-,NavigationPropertyAggregationCapabilities,-"): [NavigationPropertyRestriction](Org.OData.Capabilities.V1.md#NavigationPropertyRestriction) *(Deprecated)*
 [`Capabilities.NavigationRestrictions`](Org.OData.Capabilities.V1.md#NavigationRestrictions) that make use of the additional properties in this subtype are deprecated in favor of [`ApplySupported`](#ApplySupported) and [`CustomAggregate`](#CustomAggregate)
 
 <a name="CustomAggregateType"></a>
-## [CustomAggregateType](./Org.OData.Aggregation.V1.xml#L559:~:text=<ComplexType%20Name="-,CustomAggregateType,-") *(Deprecated)*
+## [CustomAggregateType](./Org.OData.Aggregation.V1.xml#L555:~:text=<ComplexType%20Name="-,CustomAggregateType,-") *(Deprecated)*
 Deprecated since [`NavigationPropertyAggregationCapabilities`](#NavigationPropertyAggregationCapabilities) is also deprecated
diff --git a/vocabularies/Org.OData.Aggregation.V1.xml b/vocabularies/Org.OData.Aggregation.V1.xml
index 1d764b14..b3932169 100644
--- a/vocabularies/Org.OData.Aggregation.V1.xml
+++ b/vocabularies/Org.OData.Aggregation.V1.xml
@@ -91,13 +91,9 @@
         </Annotation>
         <Annotation Term="Core.LongDescription">
           <String>Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:
-
 - Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`
-
 - Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively
-
-- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value
-          </String>
+- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value</String>
         </Annotation>
       </Term>
       <ComplexType Name="ApplySupportedBase">
diff --git a/vocabularies/Org.OData.Capabilities.V1.json b/vocabularies/Org.OData.Capabilities.V1.json
index 059a02e5..1fca2030 100644
--- a/vocabularies/Org.OData.Capabilities.V1.json
+++ b/vocabularies/Org.OData.Capabilities.V1.json
@@ -1466,7 +1466,7 @@
                 "EntityContainer"
             ],
             "@Core.Description": "Default capability settings for all collection-valued resources in the container",
-            "@Core.LongDescription": "Annotating a specific capability term, which is included as property in `DefaultCapabilitiesType`, for a specific collection-valued resource overrides the default capability with the specified properties using PATCH semantics:\n\n- Primitive or collection-valued properties specified in the specific capability term replace the corresponding properties specified in `DefaultCapabilities`\n\n- Complex-valued properties specified in the specific capability term override the corresponding properties specified in `DefaultCapabilities` using PATCH semantics recursively\n\n- Properties specified neither in the specific term nor in `DefaultCapabilities` have their default value\n          "
+            "@Core.LongDescription": "Annotating a specific capability term, which is included as property in `DefaultCapabilitiesType`, for a specific collection-valued resource overrides the default capability with the specified properties using PATCH semantics:\n- Primitive or collection-valued properties specified in the specific capability term replace the corresponding properties specified in `DefaultCapabilities`\n- Complex-valued properties specified in the specific capability term override the corresponding properties specified in `DefaultCapabilities` using PATCH semantics recursively\n- Properties specified neither in the specific term nor in `DefaultCapabilities` have their default value"
         },
         "DefaultCapabilitiesType": {
             "$Kind": "ComplexType",
diff --git a/vocabularies/Org.OData.Capabilities.V1.md b/vocabularies/Org.OData.Capabilities.V1.md
index 99ce1104..52633cc5 100644
--- a/vocabularies/Org.OData.Capabilities.V1.md
+++ b/vocabularies/Org.OData.Capabilities.V1.md
@@ -86,7 +86,7 @@ Term|Type|Description
 [CustomHeaders](./Org.OData.Capabilities.V1.xml#L976:~:text=<Term%20Name="-,CustomHeaders,-")|\[[CustomParameter](#CustomParameter)\]|<a name="CustomHeaders"></a>Custom headers that are supported/required for the annotated resource ([Example](./Org.OData.Capabilities.V1.xml#L978))
 [CustomQueryOptions](./Org.OData.Capabilities.V1.xml#L1002:~:text=<Term%20Name="-,CustomQueryOptions,-")|\[[CustomParameter](#CustomParameter)\]|<a name="CustomQueryOptions"></a>Custom query options that are supported/required for the annotated resource ([Example](./Org.OData.Capabilities.V1.xml#L1005))<br>If the entity container is annotated, the query option is supported/required by all resources in that container.
 [MediaLocationUpdateSupported](./Org.OData.Capabilities.V1.xml#L1054:~:text=<Term%20Name="-,MediaLocationUpdateSupported,-")|[Tag](Org.OData.Core.V1.md#Tag)|<a name="MediaLocationUpdateSupported"></a>Stream property or media stream supports update of its media edit URL and/or media read URL
-[DefaultCapabilities](./Org.OData.Capabilities.V1.xml#L1059:~:text=<Term%20Name="-,DefaultCapabilities,-")|[DefaultCapabilitiesType](#DefaultCapabilitiesType)|<a name="DefaultCapabilities"></a>Default capability settings for all collection-valued resources in the container<br>Annotating a specific capability term, which is included as property in `DefaultCapabilitiesType`, for a specific collection-valued resource overrides the default capability with the specified properties using PATCH semantics:<br/>- Primitive or collection-valued properties specified in the specific capability term replace the corresponding properties specified in `DefaultCapabilities`<br/>- Complex-valued properties specified in the specific capability term override the corresponding properties specified in `DefaultCapabilities` using PATCH semantics recursively<br/>- Properties specified neither in the specific term nor in `DefaultCapabilities` have their default value
+[DefaultCapabilities](./Org.OData.Capabilities.V1.xml#L1059:~:text=<Term%20Name="-,DefaultCapabilities,-")|[DefaultCapabilitiesType](#DefaultCapabilitiesType)|<a name="DefaultCapabilities"></a>Default capability settings for all collection-valued resources in the container<br><p>Annotating a specific capability term, which is included as property in <code>DefaultCapabilitiesType</code>, for a specific collection-valued resource overrides the default capability with the specified properties using PATCH semantics:</p> <ul> <li>Primitive or collection-valued properties specified in the specific capability term replace the corresponding properties specified in <code>DefaultCapabilities</code></li> <li>Complex-valued properties specified in the specific capability term override the corresponding properties specified in <code>DefaultCapabilities</code> using PATCH semantics recursively</li> <li>Properties specified neither in the specific term nor in <code>DefaultCapabilities</code> have their default value</li> </ul> 
 
 <a name="ConformanceLevelType"></a>
 ## [ConformanceLevelType](./Org.OData.Capabilities.V1.xml#L118:~:text=<EnumType%20Name="-,ConformanceLevelType,-")
@@ -678,33 +678,33 @@ Property|Type|Description
 [ExampleValues](./Org.OData.Capabilities.V1.xml#L1049:~:text=<ComplexType%20Name="-,CustomParameter,-")|\[[PrimitiveExampleValue](Org.OData.Core.V1.md#PrimitiveExampleValue)\]|Example values for the custom parameter
 
 <a name="DefaultCapabilitiesType"></a>
-## [DefaultCapabilitiesType](./Org.OData.Capabilities.V1.xml#L1072:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")
+## [DefaultCapabilitiesType](./Org.OData.Capabilities.V1.xml#L1068:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[ChangeTracking](./Org.OData.Capabilities.V1.xml#L1073:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ChangeTrackingBase?](#ChangeTrackingBase)|Change tracking capabilities
-[CountRestrictions](./Org.OData.Capabilities.V1.xml#L1076:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[CountRestrictionsBase?](#CountRestrictionsBase)|Restrictions on /$count path suffix and $count=true system query option
-[IndexableByKey](./Org.OData.Capabilities.V1.xml#L1079:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports key values according to OData URL conventions
-[TopSupported](./Org.OData.Capabilities.V1.xml#L1082:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $top
-[SkipSupported](./Org.OData.Capabilities.V1.xml#L1085:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $skip
-[ComputeSupported](./Org.OData.Capabilities.V1.xml#L1088:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $compute
-[SelectSupport](./Org.OData.Capabilities.V1.xml#L1091:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SelectSupportType?](#SelectSupportType)|Support for $select and nested query options within $select
-[FilterRestrictions](./Org.OData.Capabilities.V1.xml#L1094:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[FilterRestrictionsBase?](#FilterRestrictionsBase)|Restrictions on filter expressions
-[SortRestrictions](./Org.OData.Capabilities.V1.xml#L1097:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SortRestrictionsBase?](#SortRestrictionsBase)|Restrictions on orderby expressions
-[ExpandRestrictions](./Org.OData.Capabilities.V1.xml#L1100:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ExpandRestrictionsBase?](#ExpandRestrictionsBase)|Restrictions on expand expressions
-[SearchRestrictions](./Org.OData.Capabilities.V1.xml#L1103:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SearchRestrictionsType?](#SearchRestrictionsType)|Restrictions on search expressions
-[InsertRestrictions](./Org.OData.Capabilities.V1.xml#L1106:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[InsertRestrictionsBase?](#InsertRestrictionsBase)|Restrictions on insert operations
-[UpdateRestrictions](./Org.OData.Capabilities.V1.xml#L1109:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[UpdateRestrictionsBase?](#UpdateRestrictionsBase)|Restrictions on update operations
-[DeleteRestrictions](./Org.OData.Capabilities.V1.xml#L1112:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[DeleteRestrictionsBase?](#DeleteRestrictionsBase)|Restrictions on delete operations
-[OperationRestrictions](./Org.OData.Capabilities.V1.xml#L1115:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[OperationRestrictionsType?](#OperationRestrictionsType)|Restrictions for function or action operations
-[ReadRestrictions](./Org.OData.Capabilities.V1.xml#L1118:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ReadRestrictionsType?](#ReadRestrictionsType)|Restrictions for retrieving a collection of entities, retrieving a singleton instance
+[ChangeTracking](./Org.OData.Capabilities.V1.xml#L1069:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ChangeTrackingBase?](#ChangeTrackingBase)|Change tracking capabilities
+[CountRestrictions](./Org.OData.Capabilities.V1.xml#L1072:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[CountRestrictionsBase?](#CountRestrictionsBase)|Restrictions on /$count path suffix and $count=true system query option
+[IndexableByKey](./Org.OData.Capabilities.V1.xml#L1075:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports key values according to OData URL conventions
+[TopSupported](./Org.OData.Capabilities.V1.xml#L1078:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $top
+[SkipSupported](./Org.OData.Capabilities.V1.xml#L1081:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $skip
+[ComputeSupported](./Org.OData.Capabilities.V1.xml#L1084:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[Tag?](Org.OData.Core.V1.md#Tag)|Supports $compute
+[SelectSupport](./Org.OData.Capabilities.V1.xml#L1087:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SelectSupportType?](#SelectSupportType)|Support for $select and nested query options within $select
+[FilterRestrictions](./Org.OData.Capabilities.V1.xml#L1090:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[FilterRestrictionsBase?](#FilterRestrictionsBase)|Restrictions on filter expressions
+[SortRestrictions](./Org.OData.Capabilities.V1.xml#L1093:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SortRestrictionsBase?](#SortRestrictionsBase)|Restrictions on orderby expressions
+[ExpandRestrictions](./Org.OData.Capabilities.V1.xml#L1096:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ExpandRestrictionsBase?](#ExpandRestrictionsBase)|Restrictions on expand expressions
+[SearchRestrictions](./Org.OData.Capabilities.V1.xml#L1099:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[SearchRestrictionsType?](#SearchRestrictionsType)|Restrictions on search expressions
+[InsertRestrictions](./Org.OData.Capabilities.V1.xml#L1102:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[InsertRestrictionsBase?](#InsertRestrictionsBase)|Restrictions on insert operations
+[UpdateRestrictions](./Org.OData.Capabilities.V1.xml#L1105:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[UpdateRestrictionsBase?](#UpdateRestrictionsBase)|Restrictions on update operations
+[DeleteRestrictions](./Org.OData.Capabilities.V1.xml#L1108:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[DeleteRestrictionsBase?](#DeleteRestrictionsBase)|Restrictions on delete operations
+[OperationRestrictions](./Org.OData.Capabilities.V1.xml#L1111:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[OperationRestrictionsType?](#OperationRestrictionsType)|Restrictions for function or action operations
+[ReadRestrictions](./Org.OData.Capabilities.V1.xml#L1114:~:text=<ComplexType%20Name="-,DefaultCapabilitiesType,-")|[ReadRestrictionsType?](#ReadRestrictionsType)|Restrictions for retrieving a collection of entities, retrieving a singleton instance
 
 <a name="HttpResponse"></a>
-## [HttpResponse](./Org.OData.Capabilities.V1.xml#L1123:~:text=<ComplexType%20Name="-,HttpResponse,-")
+## [HttpResponse](./Org.OData.Capabilities.V1.xml#L1119:~:text=<ComplexType%20Name="-,HttpResponse,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[StatusCode](./Org.OData.Capabilities.V1.xml#L1124:~:text=<ComplexType%20Name="-,HttpResponse,-")|String|HTTP response status code, for example 400, 403, 501
-[Description](./Org.OData.Capabilities.V1.xml#L1127:~:text=<ComplexType%20Name="-,HttpResponse,-")|String|Human-readable description of the response
+[StatusCode](./Org.OData.Capabilities.V1.xml#L1120:~:text=<ComplexType%20Name="-,HttpResponse,-")|String|HTTP response status code, for example 400, 403, 501
+[Description](./Org.OData.Capabilities.V1.xml#L1123:~:text=<ComplexType%20Name="-,HttpResponse,-")|String|Human-readable description of the response
diff --git a/vocabularies/Org.OData.Capabilities.V1.xml b/vocabularies/Org.OData.Capabilities.V1.xml
index 7ab5086e..b9e93ea2 100644
--- a/vocabularies/Org.OData.Capabilities.V1.xml
+++ b/vocabularies/Org.OData.Capabilities.V1.xml
@@ -1060,13 +1060,9 @@ The absence of `RestrictedProperties` denotes all properties are accessible usin
         <Annotation Term="Core.Description" String="Default capability settings for all collection-valued resources in the container" />
         <Annotation Term="Core.LongDescription">
           <String>Annotating a specific capability term, which is included as property in `DefaultCapabilitiesType`, for a specific collection-valued resource overrides the default capability with the specified properties using PATCH semantics:
-
 - Primitive or collection-valued properties specified in the specific capability term replace the corresponding properties specified in `DefaultCapabilities`
-
 - Complex-valued properties specified in the specific capability term override the corresponding properties specified in `DefaultCapabilities` using PATCH semantics recursively
-
-- Properties specified neither in the specific term nor in `DefaultCapabilities` have their default value
-          </String>
+- Properties specified neither in the specific term nor in `DefaultCapabilities` have their default value</String>
         </Annotation>
       </Term>
       <ComplexType Name="DefaultCapabilitiesType">