diff --git a/Documentation/2.0/Samples/csharp/Raven.Documentation.Samples/ClientApi/ChangesApi.cs b/Documentation/2.0/Samples/csharp/Raven.Documentation.Samples/ClientApi/ChangesApi.cs
index 75e83c3497..c718832c27 100644
--- a/Documentation/2.0/Samples/csharp/Raven.Documentation.Samples/ClientApi/ChangesApi.cs
+++ b/Documentation/2.0/Samples/csharp/Raven.Documentation.Samples/ClientApi/ChangesApi.cs
@@ -1,15 +1,15 @@
 namespace RavenCodeSamples.ClientApi
 {
 	using System;
-	using Raven.Abstractions.Data;
-	using Raven.Client.Changes;
 
 	public class ChangesApi : CodeSampleBase
 	{
 		public ChangesApi()
 		{
+/*
 			using (var store = NewDocumentStore())
 			{
+
 				#region getting_database_changes_instance
 
 				IDatabaseChanges changes = store.Changes("DatabaseName");
@@ -76,6 +76,7 @@ public ChangesApi()
 					 });
 				#endregion
 			}
+*/
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs
index 74a2722f23..c58a820bf4 100644
--- a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs
@@ -157,7 +157,7 @@ public CountersExamples()
                                     },
                                     new CounterOperation
                                     {
-                                        // No delta specified, value will stay the same
+                                        // No Delta specified, value will remain unchanged
 
                                         Type = CounterOperationType.Increment,
                                         CounterName = "dislikes"
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.dotnet.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.dotnet.markdown
new file mode 100644
index 0000000000..ea30d0ed3b
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.dotnet.markdown
@@ -0,0 +1,125 @@
+# Changes API: How to Subscribe to Operation Changes
+
+The following methods allow you to subscribe to operation changes:
+
+- [ForOperationId](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperationid)
+- [ForAllOperations](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)
+
+{PANEL:ForOperationId}
+
+Operation changes for one operation can be observed using the `ForOperationId` method.
+
+{NOTE: }
+Please note that from RavenDB 6.1 on, operation changes can be tracked only on a **specific node**.  
+The purpose of this change is to improve results consistency, as an operation may behave very differently 
+on different nodes and cross-cluster tracking of an operation may become confusing and ineffective if 
+the operation fails over from one node to another.  
+Tracking operations will therefore be possible only if the `Changes` API was 
+[opened](../../client-api/changes/what-is-changes-api#accessing-changes-api) using a method that limits 
+tracking to a single node: `store.Changes(dbName, nodeTag)`  
+{NOTE/}
+
+### Syntax
+
+{CODE operation_changes_1@ClientApi\Changes\HowToSubscribeToOperationChanges.cs /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **operationId** | long | ID of an operation for which notifications will be processed. |
+
+| Return value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows you to add subscriptions to notifications for an operation with a given ID. |
+
+### Example
+
+{CODE operation_changes_2@ClientApi\Changes\HowToSubscribeToOperationChanges.cs /}
+
+{PANEL/}
+
+{PANEL:ForAllOperations}
+
+Operations changes for all Operations can be observed using the `ForAllOperations` method.
+
+{NOTE: }
+Please note that from RavenDB 6.1 on, operation changes can be tracked only on a **specific node**.  
+The purpose of this change is to improve results consistency, as an operation may behave very differently 
+on different nodes and cross-cluster tracking of an operation may become confusing and ineffective if 
+the operation fails over from one node to another.  
+Tracking operations will therefore be possible only if the `Changes` API was 
+[opened](../../client-api/changes/what-is-changes-api#accessing-changes-api) using a method that limits 
+tracking to a single node: `store.Changes(dbName, nodeTag)`  
+{NOTE/}
+
+| Return Value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows to add subscriptions to notifications for all operations. |
+
+### Syntax
+
+{CODE operation_changes_3@ClientApi\Changes\HowToSubscribeToOperationChanges.cs /}
+
+### Example
+
+{CODE operation_changes_4@ClientApi\Changes\HowToSubscribeToOperationChanges.cs /}
+
+{PANEL/}
+
+{PANEL:OperationChange}
+
+### Properties
+
+| Name | Type | Description |
+| ------------- | ------------- | ----- |
+| **State** | [OperationState](../../client-api/changes/how-to-subscribe-to-operation-changes#operationstate) | Operation state |
+| **OperationId** | long | Operation ID |
+
+{PANEL/}
+
+{PANEL:OperationState}
+
+### Members
+
+| Name | Type | Description |
+| ------------- | ------------- | ----- |
+| **Result** | [IOperationResult](../../client-api/changes/how-to-subscribe-to-operation-changes#operationresult) | Operation result |
+| **Progress** | IOperationProgress| Instance of IOperationProgress (json representation of the progress) |
+| **Status** | [OperationStatus](../../client-api/changes/how-to-subscribe-to-operation-changes#operationstatus) | Operation status |
+{PANEL/}
+
+{PANEL:OperationResult}
+
+### Members
+
+| Name | Type | Description |
+| ------------- | ------------- | ----- |
+| **Message** | string | Operation message |
+| **ShouldPersist** | bool | determine whether or not the result should be saved in the storage |
+{PANEL/}
+
+{PANEL:OperationStatus}
+
+# OperationStatus (enum)
+
+| Name | Description |
+| ---- | ----- |
+| **InProgress** | `Indicates that the operation made progress` |
+| **Completed** | `Indicates that the operation has completed` |
+| **Faulted** | `Indicates that the operation is faulted` |
+| **Canceled** | `Indicates that the operation has been Canceled` |
+{PANEL/}
+
+## Remarks
+
+{WARNING: }
+To get more method overloads, especially ones supporting **delegates**, please add the 
+[System.Reactive.Core](https://www.nuget.org/packages/System.Reactive.Core/) package to your project.  
+{WARNING/}
+
+## Related Articles
+
+### Changes API
+
+- [What is Changes API](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Document Changes](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.java.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.java.markdown
new file mode 100644
index 0000000000..6338a52cb0
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.java.markdown
@@ -0,0 +1,66 @@
+# Changes API: How to Subscribe to Operation Changes
+
+The following methods allow you to subscribe to operation changes:
+
+- [forOperationId](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperation)
+- [forAllOperations](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)
+
+{PANEL:forOperation}
+
+Operation changes for one operation can be observed using the `forOperationId` method.
+
+### Syntax
+
+{CODE:java operation_changes_1@ClientApi\Changes\HowToSubscribeToOperationChanges.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **operationId** | long | ID of an operation for which notifications will be processed. |
+
+| Return value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows you to add subscriptions to notifications for an operation with a given ID. |
+
+### Example
+
+{CODE:java operation_changes_2@ClientApi\Changes\HowToSubscribeToOperationChanges.java /}
+
+{PANEL/}
+
+{PANEL:forAllOperations}
+
+Operations changes for all Operations can be observed using the `forAllOperations` method.
+
+| Return Value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows to add subscriptions to notifications for all operations. |
+
+### Syntax
+
+{CODE:java operation_changes_3@ClientApi\Changes\HowToSubscribeToOperationChanges.java /}
+
+### Example
+
+{CODE:java operation_changes_4@ClientApi\Changes\HowToSubscribeToOperationChanges.java /}
+
+{PANEL/}
+
+{PANEL:OperationChange}
+
+### Properties
+
+| Name | Type | Description |
+| ------------- | ------------- | ----- |
+| **State** | ObjectNode | Operation state |
+| **OperationId** | long | Operation ID |
+
+{PANEL/}
+
+
+## Related Articles
+
+### Changes API
+
+- [What is Changes API](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Document Changes](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.js.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.js.markdown
new file mode 100644
index 0000000000..7cc042661c
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/how-to-subscribe-to-operation-changes.js.markdown
@@ -0,0 +1,66 @@
+# Changes API: How to Subscribe to Operation Changes
+
+The following methods allow you to subscribe to operation changes:
+
+- [forOperationId()](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperation)
+- [forAllOperations()](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)
+
+{PANEL:forOperation}
+
+Operation changes for one operation can be observed using the `forOperationId()` method.
+
+### Syntax
+
+{CODE:nodejs operation_changes_1@client-api\changes\howToSubscribeToOperationChanges.js /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **operationId** | number | ID of an operation for which notifications will be processed. |
+
+| Return value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows you to add subscriptions to notifications for an operation with a given ID. |
+
+### Example
+
+{CODE:nodejs operation_changes_2@client-api\changes\howToSubscribeToOperationChanges.js /}
+
+{PANEL/}
+
+{PANEL:forAllOperations}
+
+Operations changes for all Operations can be observed using the `forAllOperations()` method.
+
+| Return Value | |
+| ------------- | ----- |
+| IChangesObservable<[OperationStatusChange](../../client-api/changes/how-to-subscribe-to-operation-changes#operationchange)> | Observable that allows to add subscriptions to notifications for all operations. |
+
+### Syntax
+
+{CODE:nodejs operation_changes_3@client-api\changes\howToSubscribeToOperationChanges.js /}
+
+### Example
+
+{CODE:nodejs operation_changes_4@client-api\changes\howToSubscribeToOperationChanges.js /}
+
+{PANEL/}
+
+{PANEL:OperationChange}
+
+### Properties
+
+| Name | Type | Description |
+| ------------- | ------------- | ----- |
+| **state** | object | Operation state |
+| **operationId** | number | Operation ID |
+
+{PANEL/}
+
+
+## Related Articles
+
+### Changes API
+
+- [What is Changes API](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Document Changes](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.dotnet.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.dotnet.markdown
new file mode 100644
index 0000000000..6f8f49d9af
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.dotnet.markdown
@@ -0,0 +1,187 @@
+# What Is the Changes API
+
+---
+
+{NOTE: }
+
+* The Changes API is a Push Notifications service, that allows a RavenDB Client to 
+  receive messages from a RavenDB Server regarding events that occurred on the server.  
+* A client can subscribe to events related to documents, indexes, operations, counters, and time series.  
+* Using the Changes API allows you to notify users of various changes without requiring 
+  any expensive polling.  
+
+* In this page:  
+  * [Accessing Changes API](../../client-api/changes/what-is-changes-api#accessing-changes-api)  
+  * [Connection interface](../../client-api/changes/what-is-changes-api#connection-interface)  
+  * [Subscribing](../../client-api/changes/what-is-changes-api#subscribing)  
+  * [Unsubscribing](../../client-api/changes/what-is-changes-api#unsubscribing)  
+  * [FAQ](../../client-api/changes/what-is-changes-api#faq)  
+     * [Changes API and Database Timeout](../../client-api/changes/what-is-changes-api#changes-api-and-database-timeout)  
+     * [Changes API and Method Overloads](../../client-api/changes/what-is-changes-api#changes-api-and-method-overloads)  
+  * [Changes API -vs- Data Subscriptions](../../client-api/changes/what-is-changes-api#changes-api--vs--data-subscriptions)  
+{NOTE/}
+
+---
+
+{PANEL: Accessing Changes API}
+
+The changes subscription is accessible by a document store through its `IDatabaseChanges` 
+or `ISingleNodeDatabaseChanges` interfaces.
+
+{CODE changes_1@ClientApi\Changes\WhatIsChangesApi.cs /}
+{CODE changes_ISingleNodeDatabaseChanges@ClientApi\Changes\WhatIsChangesApi.cs /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **database** | `string` | Name of database to open changes API for. If `null`, the `Database` configured in DocumentStore will be used. |
+| **nodeTag** | `string` | Tag of the cluster node to open changes API for. |
+
+| Return value | |
+| ------------- | ----- |
+| `IDatabaseChanges` | Instance implementing `IDatabaseChanges` interface. |
+| `ISingleNodeDatabaseChanges` | Instance implementing `ISingleNodeDatabaseChanges` interface. |
+
+* Use `IDatabaseChanges` to subscribe to database changes.  
+* Use `ISingleNodeDatabaseChanges` to limit tracking to a specific node.  
+  {NOTE: }
+  Note that from RavenDB 6.1 on, some changes can be tracked not cross-cluster but only 
+  **on a specific node**. In these cases, it is required that you open the Changes API using 
+  the second overload, passing both a database name and a node tag: `store.Changes(dbName, nodeTag)`  
+  {NOTE/}
+
+{PANEL/}
+
+{PANEL: Connection interface}
+
+`IDatabaseChanges` inherits from `IConnectableChanges<TChanges>` interface that represent the connection.
+
+{CODE connectable_changes@ClientApi\Changes\IConnectableChanges.cs /}
+
+{PANEL/}
+
+{PANEL: Subscribing}
+
+To receive notifications regarding server-side events, subscribe using one of the following methods.  
+
+* **For Document Changes:**  
+   - [ForAllDocuments](../../client-api/changes/how-to-subscribe-to-document-changes#foralldocuments)  
+     Track changes for all document  
+   - [ForDocument](../../client-api/changes/how-to-subscribe-to-document-changes#fordocument)  
+     Track changes for a given document (by Doc ID)  
+   - [ForDocumentsInCollection](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsincollection)  
+     Track changes for all documents in a given collection  
+   - [ForDocumentsStartingWith](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsstartingwith)  
+     Track changes for documents whose ID contains a given prefix  
+
+* **For Index Changes:**  
+   - [ForAllIndexes](../../client-api/changes/how-to-subscribe-to-index-changes#forallindexes)  
+     Track changes for all indexes  
+   - [ForIndex](../../client-api/changes/how-to-subscribe-to-index-changes#forindex)  
+     Track changes for a given index (by Index Name)   
+
+* **For Operation Changes:**  
+  Operation changes can be tracked only [on a specific node](../../client-api/changes/what-is-changes-api#accessing-changes-api).  
+   - [ForAllOperations](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)  
+     Track changes for all operation  
+   - [ForOperationId](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperationid)  
+     Track changes for a given operation (by Operation ID)  
+
+* **For Counter Changes:**  
+   - [ForAllCounters](../../client-api/changes/how-to-subscribe-to-counter-changes#forallcounters)  
+     Track changes for all counters  
+   - [ForCounter](../../client-api/changes/how-to-subscribe-to-counter-changes#forcounter)  
+     Track changes for a given counter (by Counter Name)  
+   - [ForCounterOfDocument](../../client-api/changes/how-to-subscribe-to-counter-changes#forcounterofdocument)  
+     Track changes for a specific counter of a chosen document (by Doc ID and Counter Name)  
+   - [ForCountersOfDocument](../../client-api/changes/how-to-subscribe-to-counter-changes#forcountersofdocument)  
+     Track changes for all counters of a chosen document (by Doc ID)  
+
+* **For Time Series Changes:**  
+   - [ForAllTimeSeries](../../client-api/changes/how-to-subscribe-to-time-series-changes#foralltimeseries)  
+     Track changes for all time series  
+   - [ForTimeSeries](../../client-api/changes/how-to-subscribe-to-time-series-changes#fortimeseries)  
+     Track changes for all time series with a given name  
+   - [ForTimeSeriesOfDocument](../../client-api/changes/how-to-subscribe-to-time-series-changes#fortimeseriesofdocument)  
+     Track changes for -  
+      * a **specific time series** of a given document (by Doc ID and Time Series Name)  
+      * **any time series** of a given document (by Doc ID)  
+
+{PANEL/}
+
+{PANEL: Unsubscribing}
+
+To end a subscription (stop listening for particular notifications) you must 
+`Dispose` of the subscription.  
+
+{CODE changes_2@ClientApi\Changes\WhatIsChangesApi.cs /}
+
+{PANEL/}
+
+{PANEL: FAQ}
+
+#### Changes API and Database Timeout
+
+One or more open Changes API connections will prevent a database from becoming 
+idle and unloaded, regardless of [the configuration value for database idle timeout](../../server/configuration/database-configuration#databases.maxidletimeinsec).  
+
+---
+
+#### Changes API and Method Overloads
+
+{WARNING: }
+To get more method overloads, especially ones supporting **delegates**, please add the 
+[System.Reactive.Core](https://www.nuget.org/packages/System.Reactive.Core/) package to your project.  
+{WARNING/}
+
+{PANEL/}
+
+{PANEL: Changes API -vs- Data Subscriptions}
+
+**Changes API** and [Data Subscription](../../client-api/data-subscriptions/what-are-data-subscriptions) 
+are services that a RavenDB Server provides subscribing clients.  
+Both services respond to events that take place on the server, by sending updates 
+to their subscribers.  
+
+* **Changes API is a Push Notifications Service**.  
+   * Changes API subscribers receive **notifications** regarding events that 
+     took place on the server, without receiving the actual data entities 
+     affected by these events.  
+     For the modification of a document, for example, the client will receive 
+     a [DocumentChange](../../client-api/changes/how-to-subscribe-to-document-changes#documentchange) 
+     object with details like the document's ID and collection name.  
+
+   * The server does **not** keep track of sent notifications or 
+     checks clients' usage of them. It is a client's responsibility 
+     to manage its reactions to such notifications.  
+
+* **Data Subscription is a Data Consumption Service**.  
+   * A Data Subscription task keeps track of document modifications in the 
+     database and delivers the documents in an orderly fashion when subscribers 
+     indicate they are ready to receive them. 
+   * The process is fully managed by the server, leaving very little for 
+     the subscribers to do besides consuming the delivered documents.  
+
+---
+
+|    | Data Subscriptions | Changes API 
+| -- | -- | 
+| What can the server Track | [Documents](../../client-api/data-subscriptions/what-are-data-subscriptions#documents-processing) <br> [Revisions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning) <br> [Counters](../../client-api/data-subscriptions/creation/examples#including-counters) <br> Time Series | [Documents](../../client-api/changes/how-to-subscribe-to-document-changes) <br> [Indexes](../../client-api/changes/how-to-subscribe-to-index-changes) <br> [Operations](../../client-api/changes/how-to-subscribe-to-operation-changes) <br> [Counters](../../client-api/changes/how-to-subscribe-to-counter-changes) <br> [Time Series](../../client-api/changes/how-to-subscribe-to-time-series-changes) 
+| What can the server Deliver | Documents <br> Revisions <br> Counters <br> Time Series | Notifications 
+| Management | Managed by the Server | Managed by the Client 
+
+
+{PANEL/}
+
+## Related Articles
+
+### Changes API
+
+- [How to Subscribe to Document Changes](../../client-api/changes/how-to-subscribe-to-document-changes)  
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)  
+- [How to Subscribe to Operation Changes](../../client-api/changes/how-to-subscribe-to-operation-changes)  
+- [How to Subscribe to Counter Changes](../../client-api/changes/how-to-subscribe-to-counter-changes)  
+- [How to Subscribe to Time Series Changes](../../client-api/changes/how-to-subscribe-to-time-series-changes)  
+
+### Data Subscriptions
+
+- [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.java.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.java.markdown
new file mode 100644
index 0000000000..24a4450f10
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.java.markdown
@@ -0,0 +1,124 @@
+# What Is the Changes API
+
+---
+
+{NOTE: }
+
+* The Changes API is a Push Notifications service, that allows a RavenDB Client to 
+  receive messages from a RavenDB Server regarding events that occurred on the server.  
+* A client can subscribe to events related to documents, indexes, operations, counters, and time series.  
+* Using the Changes API allows you to notify users of various changes without requiring 
+  any expensive polling.  
+
+* In this page:  
+  * [Accessing Changes API](../../client-api/changes/what-is-changes-api#accessing-changes-api)  
+  * [Connection interface](../../client-api/changes/what-is-changes-api#connection-interface)  
+  * [Subscribing](../../client-api/changes/what-is-changes-api#subscribing)  
+  * [Unsubscribing](../../client-api/changes/what-is-changes-api#unsubscribing)  
+  * [Note](../../client-api/changes/what-is-changes-api#note)  
+  * [Changes API -vs- Data Subscriptions](../../client-api/changes/what-is-changes-api#changes-api--vs--data-subscriptions)  
+{NOTE/}
+
+---
+
+{PANEL: Accessing Changes API}
+
+The changes subscription is accessible by a document store through its `IDatabaseChanges` interface.
+
+{CODE:java changes_1@ClientApi\Changes\WhatIsChangesApi.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **database** | `String` | Name of database to open changes API for. If `null`, the `Database` configured in DocumentStore will be used. |
+
+| Return value | |
+| ------------- | ----- |
+| IDatabaseChanges | Instance implementing IDatabaseChanges interface. |
+
+{PANEL/}
+
+{PANEL: Connection interface}
+
+`IDatabaseChanges` inherits from `IConnectableChanges<TChanges>` interface that represent the connection.
+
+{CODE:java connectable_changes@ClientApi\Changes\IConnectableChanges.java /}
+
+{PANEL/}
+
+{PANEL: Subscribing}
+
+To receive notifications regarding server-side events, subscribe using one of the following methods.  
+
+- [forAllDocuments](../../client-api/changes/how-to-subscribe-to-document-changes#foralldocuments)
+- [forAllIndexes](../../client-api/changes/how-to-subscribe-to-index-changes#forallindexes)
+- [forAllOperations](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)
+- [forDocument](../../client-api/changes/how-to-subscribe-to-document-changes#fordocument)
+- [forDocumentsInCollection](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsincollection)
+- [forDocumentsStartingWith](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsstartingwith)
+- [forIndex](../../client-api/changes/how-to-subscribe-to-index-changes#forindex)
+- [forOperationId](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperation)
+
+{PANEL/}
+
+{PANEL: Unsubscribing}
+
+To end a subscription (stop listening for particular notifications) you must 
+`close` the subscription.  
+
+{CODE:java changes_2@ClientApi\Changes\WhatIsChangesApi.java /}
+
+{PANEL/}
+
+{PANEL: Note}
+
+{NOTE: }
+One or more open Changes API connections will prevent a database from becoming 
+idle and unloaded, regardless of [the configuration value for database idle timeout](../../server/configuration/database-configuration#databases.maxidletimeinsec).  
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Changes API -vs- Data Subscriptions}
+
+**Changes API** and [Data Subscription](../../client-api/data-subscriptions/what-are-data-subscriptions) 
+are services that a RavenDB Server provides subscribing clients.  
+Both services respond to events that take place on the server, by sending updates 
+to their subscribers.  
+
+* **Changes API is a Push Notifications Service**.  
+   * Changes API subscribers receive **notifications** regarding events that 
+     took place on the server, without receiving the actual data entities 
+     affected by these events.  
+     For the modification of a document, for example, the client will receive 
+     a [DocumentChange](../../client-api/changes/how-to-subscribe-to-document-changes#documentchange) 
+     object with details like the document's ID and collection name.  
+
+   * The server does **not** keep track of sent notifications or 
+     checks clients' usage of them. It is a client's responsibility 
+     to manage its reactions to such notifications.  
+
+* **Data Subscription is a Data Consumption Service**.  
+   * A Data Subscription task keeps track of document modifications in the 
+     database and delivers the documents in an orderly fashion when subscribers 
+     indicate they are ready to receive them. 
+   * The process is fully managed by the server, leaving very little for 
+     the subscribers to do besides consuming the delivered documents.  
+
+---
+
+|    | Data Subscriptions | Changes API 
+| -- | -- | 
+| What can the server Track | [Documents](../../client-api/data-subscriptions/what-are-data-subscriptions#documents-processing) <br> [Revisions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning) | [Documents](../../client-api/changes/how-to-subscribe-to-document-changes) <br> [Indexes](../../client-api/changes/how-to-subscribe-to-index-changes) <br> [Operations](../../client-api/changes/how-to-subscribe-to-operation-changes) <br> [Counters](../../client-api/changes/how-to-subscribe-to-counter-changes) <br> Time Series 
+| What can the server Deliver | Documents <br> Revisions | Notifications 
+| Management | Managed by the Server | Managed by the Client 
+
+
+{PANEL/}
+
+## Related Articles
+
+### Changes API
+
+- [How to Subscribe to Document Changes](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)
+- [How to Subscribe to Operation Changes](../../client-api/changes/how-to-subscribe-to-operation-changes)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.js.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.js.markdown
new file mode 100644
index 0000000000..da41d79fb6
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/changes/what-is-changes-api.js.markdown
@@ -0,0 +1,139 @@
+# What Is the Changes API
+
+---
+
+{NOTE: }
+
+* The Changes API is a Push Notifications service, that allows a RavenDB Client to 
+  receive messages from a RavenDB Server regarding events that occurred on the server.  
+* A client can subscribe to events related to documents, indexes, operations, counters, and time series.  
+* Using the Changes API allows you to notify users of various changes without requiring 
+  any expensive polling.  
+
+* In this page:  
+  * [Accessing Changes API](../../client-api/changes/what-is-changes-api#accessing-changes-api)  
+  * [Connection interface](../../client-api/changes/what-is-changes-api#connection-interface)  
+  * [Subscribing](../../client-api/changes/what-is-changes-api#subscribing)  
+  * [Unsubscribing](../../client-api/changes/what-is-changes-api#unsubscribing)  
+  * [FAQ](../../client-api/changes/what-is-changes-api#faq)  
+     * [Changes API and Database Timeout](../../client-api/changes/what-is-changes-api#changes-api-and-database-timeout)  
+     * [Changes API and Method Overloads](../../client-api/changes/what-is-changes-api#changes-api-and-method-overloads)  
+  * [Changes API -vs- Data Subscriptions](../../client-api/changes/what-is-changes-api#changes-api--vs--data-subscriptions)  
+{NOTE/}
+
+---
+
+{PANEL: Accessing Changes API}
+
+The changes subscription is accessible by a document store through its `IDatabaseChanges` interface.
+
+{CODE:nodejs changes_1@client-api\changes\whatIsChangesApi.js /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **database** | `string` | Name of database to open changes API for. If `null`, the `database` configured in DocumentStore will be used. |
+
+| Return value | |
+| ------------- | ----- |
+| `IDatabaseChanges` object | Instance implementing IDatabaseChanges interface. |
+
+{PANEL/}
+
+{PANEL: Connection interface}
+
+Changes object interface extends `IConnectableChanges` interface that represents the connection. It exposes the following properties, methods and events.
+
+| Properties and methods | | |
+| ------------- | ------------- | ----- |
+| **connected** | boolean | Indicates whether it's connected or not |
+| **on("connectionStatus")** | method | Adds a listener for 'connectionStatus' event |
+| **on("error")** | method | Adds a listener for 'error' event | 
+| **ensureConnectedNow()** | method | Returns a `Promise` resolved once connection to the server is established. | 
+
+{PANEL/}
+
+{PANEL: Subscribing}
+
+To receive notifications regarding server-side events, subscribe using one of the following methods.  
+
+- [forAllDocuments()](../../client-api/changes/how-to-subscribe-to-document-changes#foralldocuments)
+- [forAllIndexes()](../../client-api/changes/how-to-subscribe-to-index-changes#forallindexes)
+- [forAllOperations()](../../client-api/changes/how-to-subscribe-to-operation-changes#foralloperations)
+- [forDocument()](../../client-api/changes/how-to-subscribe-to-document-changes#fordocument)
+- [forDocumentsInCollection()](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsincollection)
+- [forDocumentsStartingWith()](../../client-api/changes/how-to-subscribe-to-document-changes#fordocumentsstartingwith)
+- [forIndex()](../../client-api/changes/how-to-subscribe-to-index-changes#forindex)
+- [forOperationId()](../../client-api/changes/how-to-subscribe-to-operation-changes#foroperation)
+
+{PANEL/}
+
+{PANEL: Unsubscribing}
+
+To end a subscription (stop listening for particular notifications) use `dispose`.  
+
+{CODE:nodejs changes_2@client-api\changes\whatIsChangesApi.js /}
+
+{PANEL/}
+
+{PANEL: FAQ}
+
+#### Changes API and Database Timeout
+
+One or more open Changes API connections will prevent a database from becoming 
+idle and unloaded, regardless of [the configuration value for database idle timeout](../../server/configuration/database-configuration#databases.maxidletimeinsec).  
+
+---
+
+#### Changes API and Method Overloads
+
+{WARNING: }
+To get more method overloads, especially ones supporting **delegates**, please add the 
+[System.Reactive.Core](https://www.nuget.org/packages/System.Reactive.Core/) package to your project.  
+{WARNING/}
+
+{PANEL/}
+
+{PANEL: Changes API -vs- Data Subscriptions}
+
+**Changes API** and [Data Subscription](../../client-api/data-subscriptions/what-are-data-subscriptions) 
+are services that a RavenDB Server provides subscribing clients.  
+Both services respond to events that take place on the server, by sending updates 
+to their subscribers.  
+
+* **Changes API is a Push Notifications Service**.  
+   * Changes API subscribers receive **notifications** regarding events that 
+     took place on the server, without receiving the actual data entities 
+     affected by these events.  
+     For the modification of a document, for example, the client will receive 
+     a [DocumentChange](../../client-api/changes/how-to-subscribe-to-document-changes#documentchange) 
+     object with details like the document's ID and collection name.  
+
+   * The server does **not** keep track of sent notifications or 
+     checks clients' usage of them. It is a client's responsibility 
+     to manage its reactions to such notifications.  
+
+* **Data Subscription is a Data Consumption Service**.  
+   * A Data Subscription task keeps track of document modifications in the 
+     database and delivers the documents in an orderly fashion when subscribers 
+     indicate they are ready to receive them. 
+   * The process is fully managed by the server, leaving very little for 
+     the subscribers to do besides consuming the delivered documents.  
+
+---
+
+|    | Data Subscriptions | Changes API 
+| -- | -- | 
+| What can the server Track | [Documents](../../client-api/data-subscriptions/what-are-data-subscriptions#documents-processing) <br> Revisions | [Documents](../../client-api/changes/how-to-subscribe-to-document-changes) <br> [Indexes](../../client-api/changes/how-to-subscribe-to-index-changes) <br> [Operations](../../client-api/changes/how-to-subscribe-to-operation-changes) <br> Counters <br> Time Series 
+| What can the server Deliver | Documents <br> Revisions | Notifications 
+| Management | Managed by the Server | Managed by the Client 
+
+
+{PANEL/}
+
+## Related Articles
+
+### Changes API
+
+- [How to Subscribe to Document Changes](../../client-api/changes/what-is-changes-api)
+- [How to Subscribe to Index Changes](../../client-api/changes/how-to-subscribe-to-index-changes)
+- [How to Subscribe to Operation Changes](../../client-api/changes/how-to-subscribe-to-operation-changes)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.dotnet.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.dotnet.markdown
new file mode 100644
index 0000000000..4e26e9e6bc
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.dotnet.markdown
@@ -0,0 +1,75 @@
+# Put Compare Exchange Operation
+
+---
+
+{NOTE: }
+
+* Use `PutCompareExchangeValueOperation` to save a compare-exchange _Value_ for the specified _Key_.  
+
+* Create a new _Key_ or modify an existing one.  
+
+* The _Value_ is saved only if the passed _index_ is equal to the _index_ currently stored in the server for the specified _Key_.  
+
+* Creating a new compare exchange item is possible only when the passed _index_ is `0`.  
+  
+* For an overview of the 'Compare Exchange' feature see: [Compare Exchange Overview](../../../client-api/operations/compare-exchange/overview).
+
+* In this page:  
+  * [Syntax](../../../client-api/operations/compare-exchange/put-compare-exchange-value#syntax)  
+  * [Example I - Create a new key](../../../client-api/operations/compare-exchange/put-compare-exchange-value#example-i---create-a-new-key)  
+  * [Example II - Update an existing key](../../../client-api/operations/compare-exchange/put-compare-exchange-value#example-ii---update-an-existing-key)  
+  * [Example III - Try to create an item with a non-zero index](../../../client-api/operations/compare-exchange/put-compare-exchange-value#example-iii---try-to-create-an-item-with-a-non-zero-index)  
+  
+{NOTE/}
+
+---
+
+{PANEL: Syntax}
+
+**Method**:
+{CODE put_0@ClientApi\Operations\CompareExchange\CompareExchange.cs /}
+
+| Parameter | Type | Description |
+| ----------| ---- |------------ |
+| **key** | `string` | Object identifier under which _value_ is saved, unique in the database scope across the cluster. This string can be up to 512 bytes. |
+| **value** | `T` | The value to be saved for the specified _key_. |
+| **index** | `long` | * `0` if creating a new key<br/>* The current version of _Value_ when updating a value for an existing key. |
+
+**Returned object**:
+{CODE compare_exchange_result@ClientApi\Operations\CompareExchange\CompareExchange.cs /}
+
+| Return Value | Type | Description |
+| ------------ | - | - |
+| **Successful** | `bool` | * _True_ if the save operation has completed successfully<br/>* _False_ if the save operation failed |
+| **Value** | `T` | * The value that was saved if operation was successful<br/>* The currently existing value in the server upon failure |
+| **Index** | `long` | * The version number of the value that was saved upon success<br/>* The currently existing version number in the server upon failure |
+
+{NOTE: Note:}
+When calling the 'Put' operation, the index from the request is compared to the index that is currently stored in the server (compare stage).  
+The value is updated only if the two are **equal** (exchange stage).  
+{NOTE/}
+{PANEL/}
+
+{PANEL: Example I - Create a new key}
+
+{CODE put_1@ClientApi\Operations\CompareExchange\CompareExchange.cs /}
+{PANEL/}
+
+{PANEL: Example II - Update an existing key}
+
+{CODE put_2@ClientApi\Operations\CompareExchange\CompareExchange.cs /}
+{PANEL/}
+
+{PANEL: Example III - Try to create an item with a non-zero index}
+
+{CODE put_3@ClientApi\Operations\CompareExchange\CompareExchange.cs /}
+{PANEL/}
+
+## Related Articles
+
+### Compare Exchange
+
+- [Overview](../../../client-api/operations/compare-exchange/overview)
+- [Get compare-exchange value](../../../client-api/operations/compare-exchange/get-compare-exchange-value)
+- [Get compare-exchange values](../../../client-api/operations/compare-exchange/get-compare-exchange-values)
+- [Delete compare-exchange](../../../client-api/operations/compare-exchange/delete-compare-exchange-value)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.java.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.java.markdown
new file mode 100644
index 0000000000..3bf23f4655
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.java.markdown
@@ -0,0 +1,66 @@
+# Put Compare Exchange Operation
+
+---
+
+{NOTE: }
+
+* Use `PutCompareExchangeValueOperation` to save a compare-exchange _Value_ for the specified _Key_.  
+
+* Create a new _Key_ or modify an existing one.  
+
+* The _Value_ is saved only if the _index_ passed is equal to the _index_ currently stored in the server for the specified _Key_.  
+
+* For an overview of the 'Compare Exchange' feature see: [Compare Exchange Overview](../../../client-api/operations/compare-exchange/overview).
+
+* In this page:
+  * [Syntax](../../../client-api/operations/compare-exchange/put-compare-exchange-value#syntax)
+  * [Example I - Create a new key](../../../client-api/operations/compare-exchange/put-compare-exchange-value#example-i---create-a-new-key)  
+  * [Example II - Update an existing key](../../../client-api/operations/compare-exchange/put-compare-exchange-value#example-ii---update-an-existing-key)
+{NOTE/}
+
+---
+
+{PANEL: Syntax}
+
+**Method**:
+{CODE:java put_0@ClientApi\Operations\CompareExchange\CompareExchange.java /}
+
+| Parameter | Type | Description |
+| ----------| ---- |------------ |
+| **key** | String | Object identifier under which _value_ is saved, unique in the database scope across the cluster. This string can be up to 512 bytes. |
+| **value** | `T` | The value to be saved for the specified _key_. |
+| **index** | long |  * `0` if creating a new key<br/>* The current version of _Value_ when updating a value for an existing key. |
+
+**Returned object**:
+{CODE:java compare_exchange_result@ClientApi\Operations\CompareExchange\CompareExchange.java /}
+
+| Return Value | Type | Description |
+| ------------ | - | - |
+| **Successful** | boolean | * _True_ if the save operation has completed successfully<br/>* _False_ if the save operation failed |
+| **Value** | `T` | * The value that was saved if operation was successful<br/>* The currently existing value in the server upon failure |
+| **Index** | long | * The version number of the value that was saved upon success<br/>* The currently existing version number in the server upon failure |
+
+{NOTE: Note:}
+When calling the 'Put' operation, the index from the request is compared to the index that is currently stored in the server (compare stage).  
+The value is updated only if the two are **equal** (exchange stage).  
+{NOTE/}
+{PANEL/}
+
+{PANEL: Example I - Create a new key}
+
+{CODE:java put_1@ClientApi\Operations\CompareExchange\CompareExchange.java /}
+{PANEL/}
+
+{PANEL: Example II - Update an existing key}
+
+{CODE:java put_2@ClientApi\Operations\CompareExchange\CompareExchange.java /}
+{PANEL/}
+
+## Related Articles
+
+### Compare Exchange
+
+- [Overview](../../../client-api/operations/compare-exchange/overview)
+- [Get compare-exchange value](../../../client-api/operations/compare-exchange/get-compare-exchange-value)
+- [Get compare-exchange values](../../../client-api/operations/compare-exchange/get-compare-exchange-values)
+- [Delete compare-exchange](../../../client-api/operations/compare-exchange/delete-compare-exchange-value)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.js.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.js.markdown
new file mode 100644
index 0000000000..48d19070f8
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/compare-exchange/put-compare-exchange-value.js.markdown
@@ -0,0 +1,79 @@
+# Put Compare Exchange Operation
+---
+
+{NOTE: }
+
+
+* Use the `PutCompareExchangeValueOperation` operation to either:
+  * **Create** a new compare-exchange item  
+  * **Update** the value or metadata of an existing compare-exchange item
+
+* Compare-exchange items can also be managed via [advanced session](../../../client-api/session/cluster-transaction/compare-exchange) methods 
+  or from the [Studio](../../../studio/database/documents/compare-exchange-view).
+  
+* In this page:  
+  * [Create new cmpXchg item](../../../client-api/operations/compare-exchange/put-compare-exchange-value#create-new-cmpxchg-item)  
+  * [Create new cmpXchg item with metadata](../../../client-api/operations/compare-exchange/put-compare-exchange-value#create-new-cmpxchg-item-with-metadata)  
+  * [Update existing cmpXchg item](../../../client-api/operations/compare-exchange/put-compare-exchange-value#update-existing-cmpxchg-item)
+  * [Syntax](../../../client-api/operations/compare-exchange/put-compare-exchange-value#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Create new cmpXchg item}
+
+{CODE:nodejs put_1@client-api\operations\compareExchange\putCompareExchange.js /}
+
+* Note:  
+  Using `0` with a key that already exists will Not modify existing compare-exchange item.
+
+{PANEL/}
+
+{PANEL: Create new cmpXchg item with metadata}
+
+{CODE:nodejs put_2@client-api\operations\compareExchange\putCompareExchange.js /}
+
+* Find more examples of adding metadata to a compare-exchange item in [compare-exchange metadata](../../../client-api/operations/compare-exchange/compare-exchange-metadata).
+
+{PANEL/}
+
+{PANEL: Update existing cmpXchg item}
+
+* When calling `PutCompareExchangeValueOperation`,  
+  the index from the request is compared to the index that is currently stored in the server for the specified _key_.
+* The compare-exchange item is updated only if the two are equal.
+
+{CODE:nodejs put_3@client-api\operations\compareExchange\putCompareExchange.js /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:nodejs syntax_1@client-api\operations\compareExchange\putCompareExchange.js /}
+
+| Parameter     | Type        | Description                                                                                                                                 |
+|---------------|-------------|---------------------------------------------------------------------------------------------------------------------------------------------|
+| **key**       | `string`    | <ul><li>A unique identifier in the database scope.</li><li>Can be up to 512 bytes.</li><ul>                                                 |
+| **value**     | `object`    | <ul><li>A value to be saved for the specified _key_.</li><li>Can be any object (number, string, array, or any valid JSON object).</li></ul> |
+| **index**     | `number`    | <ul><li>Pass `0` to create a new key.</li><li>When updating an existing key, pass the current number for concurrency control.</li><ul>      |
+| **metadata**  | `object`    | <ul><li>Metadata to be saved for the specified _key_.</li><li>Must be a valid JSON object.</li></ul>                                        |
+
+{CODE:nodejs syntax_2@client-api\operations\compareExchange\putCompareExchange.js /}
+
+| Return Value   | Type      | Description                                                                                                                                                                                                                                                                                                     |
+|----------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **successful** | `boolean` | <ul><li>`true` if the put operation has completed successfully.</li><li>`false` if the put operation has failed.</li></ul>                                                                                                                                                                                      |
+| **value**      | `object`  | <ul><li>Upon success - the value of the compare-exchange item that was saved.</li><li>Upon failure - the existing value on the server.</li></ul>                                                                                                                                                                |
+| **index**      | `number`  | <ul><li>The compare-exchange item's version.</li><li>This number increases with each successful modification of the `value` or `metadata`.</li><li>Upon success - the updated version of the compare-exchange item that was saved.</li><li>Upon failure - the existing version number in the server.</li></ul> |
+
+{PANEL/}
+
+## Related Articles
+
+### Compare Exchange
+
+- [Overview](../../../client-api/operations/compare-exchange/overview)
+- [Get compare-exchange value](../../../client-api/operations/compare-exchange/get-compare-exchange-value)
+- [Get compare-exchange values](../../../client-api/operations/compare-exchange/get-compare-exchange-values)
+- [Delete compare-exchange](../../../client-api/operations/compare-exchange/delete-compare-exchange-value)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.dotnet.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.dotnet.markdown
new file mode 100644
index 0000000000..281cf9480f
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.dotnet.markdown
@@ -0,0 +1,192 @@
+# Counters Batch Operation
+
+*CounterBatchOperation* allows you to operate on multiple counters (`Increment`, `Get`, `Delete`) of different documents in a **single request**.
+
+{PANEL: Syntax}
+
+{CODE:csharp counter_batch_op@ClientApi\Operations\Counters\Counters.cs /}
+
+| Parameter        |                |                                                                                                                                                              |
+|------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **counterBatch** | `CounterBatch` | An object that holds a list of `DocumentCountersOperation`.<br>Each element in the list describes the counter operations to perform for a specific document |
+
+{CODE:csharp counter_batch@ClientApi\Operations\Counters\Counters.cs /}
+
+#### DocumentCountersOperation 
+
+{CODE:csharp document_counters_op@ClientApi\Operations\Counters\Counters.cs /}
+
+#### CounterOperation 
+
+{CODE:csharp counter_operation@ClientApi\Operations\Counters\Counters.cs /}
+
+#### CounterOperationType
+
+{CODE:csharp counter_operation_type@ClientApi\Operations\Counters\Counters.cs /}
+
+{INFO: Document updates as a result of a counter operation }
+A document that has counters holds all its counter names in the `metadata`.  
+Therefore, when creating a new counter, the parent document is modified, as the counter's name needs to be added to the metadata.  
+Deleting a counter also modifies the parent document, as the counter's name needs to be removed from the metadata.  
+Incrementing an existing counter will not modify the parent document.
+
+Even if a `DocumentCountersOperation` contains several `CounterOperation` items that affect the document's metadata (create, delete),
+the parent document will be modified **only once**, after all the `CounterOperation` items in this `DocumentCountersOperation` have been processed.  
+If `DocumentCountersOperation` doesn't contain any `CounterOperation` that affects the metadata, the parent document won't be modified.
+
+{INFO/}
+
+{PANEL/}
+
+{PANEL: Return Value}
+
+* *CounterBatchOperation* returns a `CountersDetail` object, which holds a list of `CounterDetail` objects.
+
+* If a `CounterOperationType` is `Increment` or `Get`, a `CounterDetail` object will be added to the result.  
+  `Delete` operations will not be included in the result.
+
+{CODE:csharp counters_detail@ClientApi\Operations\Counters\Counters.cs /}
+
+{CODE:csharp counter_detail@ClientApi\Operations\Counters\Counters.cs /}
+
+{PANEL/}
+
+{PANEL: Examples}
+
+Assume we have two documents, *"users/1"* and *"users/2"*, that hold 3 counters each -  
+*"likes"*, *"dislikes"* and *"downloads"* -  with values 10, 20 and 30 (respectively)
+
+---
+
+### Example #1 : Increment Multiple Counters in a Batch
+
+{CODE:csharp counter_batch_exmpl1@ClientApi\Operations\Counters\Counters.cs /}
+
+#### Result:
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 15,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/1",
+			"CounterName" : "dislikes",
+			"TotalValue" : 20,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "score",
+			"TotalValue" : 50,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #2 : Get Multiple Counters in a Batch
+
+{CODE:csharp counter_batch_exmpl2@ClientApi\Operations\Counters\Counters.cs /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 15,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/1",
+			"CounterName" : "downloads",
+			"TotalValue" : 30,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "score",
+			"TotalValue" : 50,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #3 : Delete Multiple Counters in a Batch
+
+{CODE:csharp counter_batch_exmpl3@ClientApi\Operations\Counters\Counters.cs /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"Counters": []
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #4 : Mix Different Types of CounterOperations in a Batch
+
+{CODE:csharp counter_batch_exmpl4@ClientApi\Operations\Counters\Counters.cs /}
+
+#### Result:
+
+* Note: The `Delete` operations are Not included in the results.
+
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 30,
+			"CounterValues" : null
+		},
+        null,
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+{PANEL/}
+
+## Related Articles
+
+### Operations
+
+- [What are Operations](../../../client-api/operations/what-are-operations)
+- [Get Counters Operation](../../../client-api/operations/counters/get-counters)
+
+
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.java.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.java.markdown
new file mode 100644
index 0000000000..fed3c358c0
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.java.markdown
@@ -0,0 +1,192 @@
+# Counters Batch Operation
+
+*CounterBatchOperation* allows you to operate on multiple counters (`INCREMENT`, `GET`, `DELETE`) of different documents in a **single request**.
+
+{PANEL: Syntax}
+
+{CODE:java counter_batch_op@ClientApi\Operations\Counters\Counters.java /}
+
+| Parameter        |                |                                                                                                                                                              |
+|------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **counterBatch** | `CounterBatch` | An object that holds a list of `DocumentCountersOperation`.<br>Each element in the list describes the counter operations to perform for a specific document |
+
+{CODE:java counter_batch@ClientApi\Operations\Counters\Counters.java /}
+
+#### DocumentCountersOperation 
+
+{CODE:java document_counters_op@ClientApi\Operations\Counters\Counters.java /}
+
+#### CounterOperation 
+
+{CODE:java counter_operation@ClientApi\Operations\Counters\Counters.java /}
+
+#### CounterOperationType
+
+{CODE:java counter_operation_type@ClientApi\Operations\Counters\Counters.java /}
+
+{INFO: Document updates as a result of a counter operation }
+A document that has counters holds all its counter names in the `metadata`.  
+Therefore, when creating a new counter, the parent document is modified, as the counter's name needs to be added to the metadata.  
+Deleting a counter also modifies the parent document, as the counter's name needs to be removed from the metadata.  
+Incrementing an existing counter will not modify the parent document.
+
+Even if a `DocumentCountersOperation` contains several `CounterOperation` items that affect the document's metadata (create, delete),
+the parent document will be modified **only once**, after all the `CounterOperation` items in this `DocumentCountersOperation` have been processed.  
+If `DocumentCountersOperation` doesn't contain any `CounterOperation` that affects the metadata, the parent document won't be modified.
+
+{INFO/}
+
+{PANEL/}
+
+{PANEL: Return Value}
+
+* *CounterBatchOperation* returns a `CountersDetail` object, which holds a list of `CounterDetail` objects.
+
+* If a `CounterOperationType` is `INCREMENT` or `GET`, a `CounterDetail` object will be added to the result.  
+  `DELETE` operations will not be included in the result.
+
+{CODE:java counters_detail@ClientApi\Operations\Counters\Counters.java /}
+
+{CODE:java counter_detail@ClientApi\Operations\Counters\Counters.java /}
+
+{PANEL/}
+
+{PANEL: Examples}
+
+Assume we have two documents, *"users/1"* and *"users/2"*, that hold 3 counters each -  
+*"likes"*, *"dislikes"* and *"downloads"* -  with values 10, 20 and 30 (respectively)
+
+---
+
+### Example #1 : Increment Multiple Counters in a Batch
+
+{CODE:java counter_batch_exmpl1@ClientApi\Operations\Counters\Counters.java /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 15,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/1",
+			"CounterName" : "dislikes",
+			"TotalValue" : 20,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "score",
+			"TotalValue" : 50,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #2 : Get Multiple Counters in a Batch
+
+{CODE:java counter_batch_exmpl2@ClientApi\Operations\Counters\Counters.java /}
+
+#### Result:
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 15,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/1",
+			"CounterName" : "downloads",
+			"TotalValue" : 30,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		},
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "score",
+			"TotalValue" : 50,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #3 : Delete Multiple Counters in a Batch
+
+{CODE:java counter_batch_exmpl3@ClientApi\Operations\Counters\Counters.java /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"Counters": []
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #4 : Mix Different Types of CounterOperations in a Batch
+
+{CODE:java counter_batch_exmpl4@ClientApi\Operations\Counters\Counters.java /}
+
+#### Result:
+
+* Note: The `Delete` operations are Not included in the result.
+
+{CODE-BLOCK:json}
+{
+	"Counters": 
+    [
+		{
+			"DocumentId" : "users/1",
+			"CounterName" : "likes",
+			"TotalValue" : 30,
+			"CounterValues" : null
+		},
+        null,
+        {
+			"DocumentId" : "users/2",
+			"CounterName" : "likes",
+			"TotalValue" : 110,
+			"CounterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+{PANEL/}
+
+## Related Articles
+
+### Operations
+
+- [What are Operations](../../../client-api/operations/what-are-operations)
+- [Get Counters Operation](../../../client-api/operations/counters/get-counters)
+
+
diff --git a/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.js.markdown b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.js.markdown
new file mode 100644
index 0000000000..e61cf2c89d
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/client-api/operations/counters/counter-batch.js.markdown
@@ -0,0 +1,185 @@
+# Counters Batch Operation
+
+*CounterBatchOperation* allows you to operate on multiple counters (`Increment`, `Get`, `Delete`) of different documents in a **single request**.
+
+{PANEL: Syntax}
+
+{CODE:nodejs syntax_1@client-api\operations\counters\countersBatch.js /}
+
+| Parameter        |                |                                                                                                                                                              |
+|------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **counterBatch** | `CounterBatch` | An object that holds a list of `DocumentCountersOperation`.<br>Each element in the list describes the counter operations to perform for a specific document |
+
+{CODE:nodejs syntax_2@client-api\operations\counters\countersBatch.js /}
+
+{CODE:nodejs syntax_3@client-api\operations\counters\countersBatch.js /}
+
+{CODE:nodejs syntax_4@client-api\operations\counters\countersBatch.js /}
+
+{INFO: Document updates as a result of a counter operation }
+A document that has counters holds all its counter names in the `metadata`.  
+Therefore, when creating a new counter, the parent document is modified, as the counter's name needs to be added to the metadata.  
+Deleting a counter also modifies the parent document, as the counter's name needs to be removed from the metadata.  
+Incrementing an existing counter will not modify the parent document.
+
+Even if a `DocumentCountersOperation` contains several `CounterOperation` items that affect the document's metadata (create, delete),
+the parent document will be modified **only once**, after all the `CounterOperation` items in this `DocumentCountersOperation` have been processed.  
+If `DocumentCountersOperation` doesn't contain any `CounterOperation` that affects the metadata, the parent document won't be modified.
+
+{INFO/}
+
+{PANEL/}
+
+{PANEL: Return Value}
+
+* *CounterBatchOperation* returns a `CountersDetail` object, which holds a list of `CounterDetail` objects.
+
+* If the type is `Increment` or `Get`, a `CounterDetail` object will be added to the result.  
+  `Delete` operations will Not be included in the result.
+
+{CODE:nodejs syntax_5@client-api\operations\counters\countersBatch.js /}
+
+{CODE:nodejs syntax_6@client-api\operations\counters\countersBatch.js /}
+
+{PANEL/}
+
+{PANEL: Examples}
+
+Assume we have two documents, `users/1` and `users/2`, that hold 3 counters each -  
+_"Likes"_, _"Dislikes"_ and _"Downloads"_ -  with values 10, 20 and 30 (respectively)
+
+---
+
+### Example #1 : Increment Multiple Counters in a Batch
+
+{CODE:nodejs example_1@client-api\operations\counters\countersBatch.js /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"counters": 
+    [
+		{
+			"documentId"    : "users/1",
+			"counterName"   : "Likes",
+			"totalValue"    : 15,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/1",
+			"counterName"   : "Dislikes",
+			"totalValue"    : 20,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/2",
+			"counterName"   : "Likes",
+			"totalValue"    : 110,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/2",
+			"counterName"   : "score",
+			"totalValue"    : 50,
+			"counterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #2 : Get Multiple Counters in a Batch
+
+{CODE:nodejs example_2@client-api\operations\counters\countersBatch.js /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"counters": 
+    [
+		{
+			"documentId"    : "users/1",
+			"counterName"   : "Likes",
+			"totalValue"    : 15,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/1",
+			"counterName"   : "Downloads",
+			"totalValue"    : 30,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/2",
+			"counterName"   : "Likes",
+			"totalValue"    : 110,
+			"counterValues" : null
+		},
+        {
+			"documentId"    : "users/2",
+			"counterName"   : "Score",
+			"totalValue"    : 50,
+			"counterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #3 : Delete Multiple Counters in a Batch
+
+{CODE:nodejs example_3@client-api\operations\counters\countersBatch.js /}
+
+#### Result:
+
+{CODE-BLOCK:json}
+{
+	"counters": []
+}
+{CODE-BLOCK/}
+
+---
+
+### Example #4 : Mix Different Types of CounterOperations in a Batch
+
+{CODE:nodejs example_4@client-api\operations\counters\countersBatch.js /}
+
+#### Result:
+
+* Note: The `Delete` operations are Not included in the result.
+
+{CODE-BLOCK:json}
+{
+	"counters": 
+    [
+		{
+			"documentId"    : "users/1",
+			"counterName"   : "Likes",
+			"totalValue"    : 30,
+			"counterValues" : null
+		},
+        null,
+        {
+			"documentId"    : "users/2",
+			"counterName"   : "Likes",
+			"totalValue"    : 110,
+			"counterValues" : null
+		}
+	]
+}
+{CODE-BLOCK/}
+
+{PANEL/}
+
+## Related Articles
+
+### Operations
+
+- [What are Operations](../../../client-api/operations/what-are-operations)
+- [Get Counters Operation](../../../client-api/operations/counters/get-counters)
+
+
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/corax.markdown b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/corax.markdown
new file mode 100644
index 0000000000..a8c472458d
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/corax.markdown
@@ -0,0 +1,560 @@
+# Search Engine: Corax
+---
+
+{NOTE: }
+
+* **Corax** is RavenDB's native search engine, introduced in RavenDB 
+  version 6.0 as an in-house searching alternative for Lucene.  
+  Lucene remains available as well, you can use either search engine 
+  as you prefer.  
+
+* The main role of the database's search engine is to **satisfy incoming queries**.  
+  In RavenDB, the search engine achieves this by handling each query via an index.  
+  If no relevant index exists, the search engine will create one automatically.  
+  
+    The search engine is the main "moving part" of the indexing mechanism, 
+    which processes and indexes documents by index definitions.  
+
+* The search engine supports both [Auto](../../indexes/creating-and-deploying#auto-indexes) 
+  and [Static](../../indexes/creating-and-deploying#static-indexes) indexing 
+  and can be selected separately for each.  
+
+* The search engine can be selected per server, per database, and per index (for static indexes only).  
+
+* In this page:  
+   * [Selecting the search engine](../../indexes/search-engine/corax#selecting-the-search-engine)  
+      * [Server wide](../../indexes/search-engine/corax#select-search-engine-server-wide)  
+      * [Per database](../../indexes/search-engine/corax#select-search-engine-per-database)  
+      * [Per index](../../indexes/search-engine/corax#select-search-engine-per-index)  
+   * [Unsupported features](../../indexes/search-engine/corax#unsupported-features)  
+      * [Unimplemented methods](../../indexes/search-engine/corax#unimplemented-methods)  
+   * [Handling of complex JSON objects](../../indexes/search-engine/corax#handling-of-complex-json-objects)  
+   * [Compound fields](../../indexes/search-engine/corax#compound-fields)  
+   * [Limits](../../indexes/search-engine/corax#limits)  
+   * [Configuration options](../../indexes/search-engine/corax#configuration-options)  
+   * [Index training: Compression dictionaries](../../indexes/search-engine/corax#index-training:-compression-dictionaries)
+{NOTE/}
+
+---
+
+{PANEL: Selecting the search engine}
+
+* You can select your preferred search engine in several scopes:  
+   * [Server-wide](../../indexes/search-engine/corax#select-search-engine-server-wide), 
+     selecting which search engine will be used by all the databases hosted by this server.  
+   * [Per database](../../indexes/search-engine/corax#select-search-engine-per-database), 
+     overriding server-wide settings for a specific database.  
+   * [Per index](../../indexes/search-engine/corax#select-search-engine-per-index), 
+     overriding server-wide and per-database settings.  
+     Per-index settings are available only for **static** indexes.  
+
+     {NOTE: }
+     Note that the search engine is selected for **new indexes** only.  
+     These settings do not apply to existing indexes.  
+     {NOTE/}
+
+* These configuration options are available:  
+   * [Indexing.Auto.SearchEngineType](../../server/configuration/indexing-configuration#indexing.auto.searchenginetype)  
+     Use this option to select the search engine (either `Lucene` or `Corax`) for **auto** indexes.  
+     The search engine can be selected **server-wide** or **per database**.  
+   * [Indexing.Static.SearchEngineType](../../server/configuration/indexing-configuration#indexing.static.searchenginetype)  
+     Use this option to select the search engine (either `Lucene` or `Corax`) for **static** indexes.  
+     The search engine can be selected **server-wide**, **per database**, or **per index**.  
+   * Read about additional Corax configuration options [here](../../indexes/search-engine/corax#configuration-options).  
+
+---
+
+### Select search engine: Server wide
+
+Select the search engine for all the databases hosted by a server 
+by modifying the server's [settings.json](../../server/configuration/configuration-options#settings.json) file.  
+E.g. -  
+{CODE-BLOCK: csharp}
+{
+    "Indexing.Auto.SearchEngineType": "Corax"
+    "Indexing.Static.SearchEngineType": "Corax"
+}
+{CODE-BLOCK/}
+
+{NOTE: }
+You must restart the server for the new settings to be read and applied.  
+{NOTE/}
+
+{NOTE: }
+Selecting a new search engine will change the search engine only for indexes created from now on.  
+
+E.g., If my configuration has been `"Indexing.Static.SearchEngineType": "Corax"` 
+until now and I now changed it to `"Indexing.Static.SearchEngineType": "Lucene"`, 
+static indexes created from now on will use Lucene, but static indexes created 
+while Corax was selected will continue using Corax.  
+
+After selecting a new search engine using the above options, change the search 
+engine used by an existing index by [resetting](../../client-api/operations/maintenance/indexes/reset-index) 
+the index.  
+{NOTE/}
+
+
+---
+
+### Select search engine: Per database
+
+To select the search engine that the database would use, modify the 
+relevant Database Record settings. You can easily do this via Studio:  
+
+* Open Studio's [Database Settings](../../studio/database/settings/database-settings) 
+  page, and enter `SearchEngine` in the search bar to find the search engine settings.  
+  Click `Edit` to modify the default search engine.  
+
+     ![Database Settings](images/corax-04_database-settings_01.png "Database Settings")
+
+* Select your preferred search engine for Auto and Static indexes.  
+
+     ![Corax Database Options](images/corax-05_database-settings_02.png "Corax Database Options")
+
+* To apply the new settings either **disable and re-enable the database** or **restart the server**.  
+
+     ![Default Search Engine](images/corax-06_database-settings_03.png "Default Search Engine")
+
+---
+
+### Select search engine: Per index 
+
+You can also select the search engine that would be used by a specific index, 
+overriding any per-database and per-server settings.  
+
+#### Select index search engine via studio:  
+
+* **Indexes-List-View** > **Edit Index Definition**  
+  Open Studio's [Index List](../../studio/database/indexes/indexes-list-view) 
+  view and select the index whose search engine you want to set.  
+
+    ![Index Definition](images/corax-02_index-definition.png "Index Definition")
+    1. Open the index **Configuration** tab.  
+    2. Select the search engine you prefer for this index.  
+       ![Per-Index Search Engine](images/corax-03_index-definition_searcher-select.png "Per-Index Search Engine")
+
+* The indexes list view will show the changed configuration.  
+
+    ![Search Engine Changed](images/corax-01_search-engine-changed.png "Search Engine Changed")
+
+---
+
+#### Select index search engine using code
+
+While defining an index using the API, use the `SearchEngineType` 
+property to select the search engine that would run the index.  
+Available values: `SearchEngineType.Lucene`, `SearchEngineType.Corax`.  
+
+* You can pass the search engine type you prefer:  
+  {CODE:csharp index-definition_select-while-creating-index@Indexes/SearchEngines.cs /}  
+* And set it in the index definition:  
+  {CODE:csharp index-definition_set-search-engine-type@Indexes/SearchEngines.cs /}  
+
+{PANEL/}
+
+{PANEL: Unsupported features}
+
+The below features are currently not supported by Corax.
+
+#### Unsupported during indexing:
+
+* Setting a [boost factor on an index-field](../../indexes/boosting#assign-a-boost-factor-to-an-index-field) is not supported.  
+  Note that [boosting the whole index-entry](../../indexes/boosting#assign-a-boost-factor-to-the-index-entry) IS supported.
+* Indexing [WKT shapes](../../indexes/indexing-spatial-data) is not supported.  
+  Note that indexing **spatial points** IS supported.  
+* [Custom analyzers](../../studio/database/settings/custom-analyzers)  
+* [Custom Sorters](../../indexes/querying/sorting#creating-a-custom-sorter)  
+
+#### Unsupported while querying:
+
+* [Fuzzy Search](../../client-api/session/querying/text-search/fuzzy-search)  
+* [Explanations](../../client-api/session/querying/debugging/include-explanations)  
+
+#### Complex JSON properties:
+
+Complex JSON properties cannot currently be indexed and searched by Corax.  
+Read more about this [below](../../indexes/search-engine/corax#handling-of-complex-json-objects).  
+
+#### Unsupported `WHERE` methods/terms:  
+
+* [lucene()](../../client-api/session/querying/document-query/how-to-use-lucene)  
+* [intersect()](../../indexes/querying/intersection)  
+
+---
+
+### Unimplemented methods
+
+Trying to use Corax with an unimplemented method (see 
+[Unsupported Features](../../indexes/search-engine/corax#unsupported-features) above) 
+will generate a `NotSupportedInCoraxException` exception and end the search.  
+
+{INFO: }
+E.g. -  
+The following query uses the `intersect` method, which is currently not supported by Corax.  
+{CODE-BLOCK: SQL}
+from index 'Orders/ByCompany'
+where intersect(Count > 10, Total > 3)
+{CODE-BLOCK/}
+
+If you set Corax as the search engine for the `Orders/ByCompany` index 
+used by the above query, running the query will generate the following 
+exception and the search will stop.  
+  ![Method Not Implemented Exception](images/corax-07_exception-method-not-implemented.png "Method Not Implemented Exception")
+{INFO/}
+
+{PANEL/}
+
+{PANEL: Handling of complex JSON objects}
+
+To avoid unnecessary resource usage, the content of complex JSON properties is not indexed by RavenDB.  
+[See below](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+how auto and static indexes handle such fields.  
+
+{NOTE: }
+Lucene's approach of indexing complex fields as JSON strings usually makes no 
+sense, and is not supported by Corax.  
+{NOTE/}
+
+Consider, for example, the following `orders` document:  
+{CODE-BLOCK: json}
+{
+    "Company": "companies/27-A",
+    "Employee": "employees/2-A",
+    "ShipTo": {
+        "City": "Torino",
+        "Country": "Italy",
+        "Location": {
+            "Latitude": 45.0907661,
+            "Longitude": 7.687425699999999
+        }
+    }
+}
+{CODE-BLOCK/}
+
+As `Location` contains a list of key/value pairs rather than a simple numeric value or a string, 
+Corax will not index its contents (see [here](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+what will be indexes).  
+
+There are several ways to handle the indexing of complex JSON objects:  
+
+#### 1. Index a simple property contained in the complex field
+
+Index one of the simple key/value properties stored within the nested object.  
+In the `Location` field, for example, Location's `Latitude` and `Longitude`.  
+can serve us this way:  
+
+{CODE-BLOCK: json}
+from order in docs.Orders
+select new
+{
+    Latitude = order.ShipTo.Location.Latitude,
+    Longitude = order.ShipTo.Location.Longitude
+}
+{CODE-BLOCK/}
+
+---
+
+#### 2. Index the document using lucene
+
+As long as Corax doesn't index complex JSON objects, you can always 
+select Lucene as your search engine when you need to index nested properties.  
+
+---
+
+#### 3. Revise index definition and fields usage
+
+As [shown above](../../indexes/search-engine/corax#index-a-simple-property-contained-in-the-complex-field), 
+indexing a whole complex field is rarely needed, and users would typically 
+index and search only the simple properties such a field contains.  
+Queries may sometimes need, however, to **project** the content of an entire 
+complex field.  
+When this is the case, you can revise the index definition (see below) to 
+**disable the indexing** of the complex field but **store its content** so 
+[projection queries](../../indexes/querying/projections#projections-and-stored-fields) 
+would be able to project it.  
+{NOTE: }
+Content we retrieve from the database and store in indexes becomes available for 
+projection and will be henceforth retrieved directly from the indexes, accelerating 
+its retrieval at the expense of indexes storage space.
+{NOTE/}
+
+* To store a field's content and disable its indexing **via Studio**:  
+  
+     ![Disable indexing of a Nested Field](images/corax-08_disable-indexing-of-nested-field.png "Disable indexing of a Nested Field ")
+
+     1. Open the index definition's **Fields** tab.  
+     2. Click **Add Field** to specify what field Corax shouldn't index.  
+     3. Enter the name of the field Corax should not index.  
+     4. Select **Yes** to Store the field's content  
+     5. Select **No** to disable the field's indexing  
+
+* To store a field's content and disable its indexing **using Code**:  
+  {CODE:csharp index-definition_disable-indexing-for-specified-field@Indexes/SearchEngines.cs /}  
+
+---
+
+#### 4. Turn the complex property into a string
+
+You can handle the complex property as a string.  
+
+{CODE-TABS}
+{CODE-TAB-BLOCK:sql:Not_Supported_By_Corax}
+from order in docs.Orders
+select new
+{
+    // This will fail for the above document when using Corax
+    Location = order.ShipTo.Location
+}
+{CODE-TAB-BLOCK/}
+{CODE-TAB-BLOCK:sql:Use_ToString()}
+from order in docs.Orders
+select new
+{
+    // .ToString() will convert the data to a string in JSON format (same as using JsonConvert.Serialize()) 
+    Location = order.ShipTo.Location.ToString()
+}
+{CODE-TAB-BLOCK/}
+{CODE-TABS/}
+
+{NOTE: }
+Serializing all the properties of a complex property into a single string, 
+including names, values, brackets, and so on, can be used as a last resort 
+to produce a string that **doesn't** make a good feed for analyzers and is not 
+commonly used for searches.  
+It does, however, make sense in some cases to **project** such a string.  
+{NOTE/}
+
+---
+
+#### If Corax encounters a complex property while indexing:  
+Auto and Static indexes handle complex fields differently.  
+New and Old static indexes also handle complex fields differently.  
+
+* **Auto Index**  
+  An auto index will replace a complex field with a `JSON_VALUE` string.  
+  This will allow basic queries over the field, like checking if it 
+  exists using `Field == null` or `exists(Field)`.  
+   * Corax will also raise a complex-field alert:  
+     {CODE-BLOCK:JSON}
+We have detected a complex field in an auto index. To avoid higher 
+resources usage when processing JSON objects, the values of these fields 
+will be replaced with JSON_VALUE.  
+Please consider querying on individual fields of that object or using 
+a static index.
+{CODE-BLOCK/}
+
+* **New static index** (created or reset on RavenDB `6.1.x` and on)  
+  The index will behave as determined by the 
+  [Indexing.Corax.Static.ComplexFieldIndexingBehavior](../../server/configuration/indexing-configuration#indexing.corax.static.complexfieldindexingbehavior) 
+  configuration option.  
+   * If `ComplexFieldIndexingBehavior` is set to **`Throw`** -  
+     Corax will throw a `NotSupportedInCoraxException` exception with this message:  
+     {CODE-BLOCK:JSON}
+The value of `{fieldName}` field is a complex object.  
+Typically a complex field is not intended to be indexed as a whole hence indexing 
+it as a text isn't supported in Corax. The field is supposed to have 'Indexing' 
+option set to 'No' (note that you can still store it and use it in projections).  
+Alternatively you can switch 'Indexing.Corax.Static.ComplexFieldIndexingBehavior' 
+configuration option from 'Throw' to 'Skip' to disable the indexing of all complex 
+fields in the index or globally for all indexes (index reset is required).  
+If you really need to use this field for searching purposes, you have to call ToString() 
+on the field value in the index definition. Although it's recommended to index individual 
+fields of this complex object.  
+Read more at: https://ravendb.net/l/OB9XW4/6.1  
+{CODE-BLOCK/}
+   * If `ComplexFieldIndexingBehavior` is set to **`Skip`** -  
+     Corax will skip indexing the complex field without throwing an exception.  
+
+* **Old static index** (created using RavenDB `6.0.x` or older)  
+  If the index doesn't explicitly relate to the complex field, Corax will automatically 
+  **disable indexing** for this field by defining **Indexing: No** for it as shown 
+  [above](../../indexes/search-engine/corax#disable-the-indexing-of-the-complex-field).  
+   * If the Indexing flag is set to anything but "no" -  
+     Corax will throw a `NotSupportedInCoraxException` exception.  
+     As disabling indexing for this field will prevent additional attempts to index its values,  
+     the exception will be thrown just once.  
+
+{PANEL/}
+
+{PANEL: Compound fields}
+
+{INFO: }
+This feature should be applied to very large datasets and specific queries.  
+It is meant for **experts only**.  
+{INFO/}
+
+A compound field is a Corax index field comprised of 2 simple data elements.  
+{NOTE: }
+A compound field can currently be composed of exactly **2 elements**.  
+{NOTE/}
+
+Expert users can define compound fields to optimize data retrieval: data stored in a compound 
+field is sorted as requested by the user, and would later on be retrieved in this order 
+with extreme efficiency.  
+Compound fields can also be used to unify simple data elements in cohesive units to 
+make the index more readable. 
+
+* **Adding a Compound Field**  
+  In an index definition, add a compound field using the `CompoundField` method.  
+  Pass the method simple data elements in the order by which you want them to be sorted.  
+* **Example**  
+  An example of an index definition with a compound field can be:  
+  {CODE-BLOCK:csharp}
+private class Product_Location : AbstractIndexCreationTask<Product>
+{
+    public Product_Location()
+    {
+        Map = products => 
+            from p in products 
+            select new { p.Brand, p.Location };
+
+        // Add a compound field 
+        CompoundField(x => x.Brand, x => x.Location);
+    }
+}
+{CODE-BLOCK/}
+
+    The query that uses the indexed data will look no different than if the 
+    index included no compound field, but produce the results much faster.  
+
+    {CODE-TABS}
+{CODE-TAB-BLOCK:csharp:Query}
+using (var s = store.OpenSession())
+{
+    // Use the internal optimization previously created by the added compound field
+    var products = s.Query<Product, Product_Location>()
+        .Where(x => x.Brand == "RunningShoes")
+        .OrderBy(x => x.Location)
+        .ToList();
+}
+{CODE-TAB-BLOCK/}
+{CODE-TAB-BLOCK:sql:RQL}
+from Products 
+where Brand = "RunningShoes" 
+order by Location 
+{CODE-TAB-BLOCK/}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Limits}
+
+* Corax can create and use indexes of more than `int.MaxValue` (2,147,483,647) documents.  
+  To match this capacity, queries over Corax indexes can 
+  [skip](../../client-api/session/querying/what-is-rql#limit) 
+  a number of results that exceeds `int.MaxValue` and 
+  [take](../../indexes/querying/paging#example-ii---basic-paging) 
+  documents from this location.  
+
+* The maximum number of documents that can be **projected** by a query 
+  (using either Corax or Lucene) is `int.MaxValue` (2,147,483,647).  
+
+{PANEL/}
+
+{PANEL: Configuration options}
+
+Corax configuration options include:  
+
+* [Indexing.Auto.SearchEngineType](../../server/configuration/indexing-configuration#indexing.auto.searchenginetype)  
+  [Select](../../indexes/search-engine/corax#selecting-the-search-engine) the search engine for **Auto** indexes.  
+
+* [Indexing.Static.SearchEngineType](../../server/configuration/indexing-configuration#indexing.static.searchenginetype)  
+  [Select](../../indexes/search-engine/corax#selecting-the-search-engine) the search engine for **Static** indexes.  
+
+* [Indexing.Corax.IncludeDocumentScore](../../server/configuration/indexing-configuration#indexing.corax.includedocumentscore)  
+  Choose whether to include the score value in document metadata when sorting by score.  
+  {NOTE: }
+  Disabling this option can improve query performance.  
+  {NOTE/}
+
+* [Indexing.Corax.IncludeSpatialDistance](../../server/configuration/indexing-configuration#indexing.corax.includespatialdistance)  
+  Choose whether to include spatial information in document metadata when sorting by distance.  
+  {NOTE: }
+  Disabling this option can improve query performance.  
+  {NOTE/}
+
+* [Indexing.Corax.MaxMemoizationSizeInMb](../../server/configuration/indexing-configuration#indexing.corax.maxmemoizationsizeinmb)  
+  The maximum amount of memory that Corax can use for a memoization clause during query processing.  
+  {WARNING: Expert Level Configuration}
+  Please configure this option only if you are an expert.
+  {WARNING/}
+
+* [Indexing.Corax.DocumentsLimitForCompressionDictionaryCreation](../../server/configuration/indexing-configuration#indexing.corax.documentslimitforcompressiondictionarycreation)  
+  Set the maximum number of documents that will be used for the training of a Corax index during dictionary creation.  
+  Training will stop when it reaches this limit.  
+
+* [Indexing.Corax.MaxAllocationsAtDictionaryTrainingInMb](../../server/configuration/indexing-configuration#indexing.corax.maxallocationsatdictionarytraininginmb)  
+  Set the maximum amount of memory (in MB) that will be allocated for the training of a Corax index during dictionary creation.  
+  Training will stop when it reaches this limit.  
+
+* [Indexing.Corax.Static.ComplexFieldIndexingBehavior](../../server/configuration/indexing-configuration#indexing.corax.static.complexfieldindexingbehavior)  
+  Choose [how to react](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+  when a static Corax index is requested to index a complex JSON object.  
+  
+{PANEL/}
+
+{PANEL: Index training: Compression dictionaries}
+
+When creating Corax indexes, RavenDB analyzes index contents and trains 
+[compression dictionaries](https://en.wikibooks.org/wiki/Data_Compression/Dictionary_compression) 
+for much higher storage and execution efficiency.  
+
+* The larger the collection, the longer the training process will take.  
+  The index, however, will become more efficient in terms of resource usage.  
+* The training process can take from a few seconds to up to a minute in multiterabyte collections.  
+* The IO speed of the storage system also affects the training time.  
+
+Here are some additional things to keep in mind about Corax indexes compression dictionaries:  
+
+* Compression dictionaries are used to store index terms more efficiently.  
+  This can significantly reduce the size of the index, which can improve performance.  
+* The training process is **only performed once**, when the index is created.  
+* The compression dictionaries are stored with the index and are used for all subsequent 
+  operations (indexing and querying).  
+* The benefits of compression dictionaries are most pronounced for large collections.  
+  {NOTE: }
+  Training stops when it reaches either the 
+  [number of documents](../../server/configuration/indexing-configuration#indexing.corax.documentslimitforcompressiondictionarycreation)
+  threshold (100,000 docs by default) or the 
+  [amount of memory](../../server/configuration/indexing-configuration#indexing.corax.maxallocationsatdictionarytraininginmb) 
+  threshold (up to 2GB). Both thresholds are configurable.  
+  {NOTE/}
+* If upon creation there are less than 10,000 documents in the involved collections, 
+  it may make sense to manually force an index reset after reaching 
+  [100,000](../../server/configuration/indexing-configuration#indexing.corax.documentslimitforcompressiondictionarycreation) 
+  documents to force retraining.  
+  {NOTE: }
+  Indexes are replaced in a [side-by-side](../../studio/database/indexes/indexes-list-view#indexes-list-view---side-by-side-indexing) 
+  manner: existing indexes would continue running until the new ones are created, 
+  to avoid any interruption to existing queries.  
+  {NOTE/}
+
+---
+
+### Corax and the Test Index Interface
+Corax indexes will **not** train compression dictionaries if they are created in the 
+[Test Index](../../studio/database/indexes/create-map-index#test-index) interface, 
+because the testing interface is designed for indexing prototyping and the training 
+process will add unnecessary overhead.
+
+{PANEL/}
+
+
+## Related Articles
+
+### Indexes
+
+- [Auto Indexes](../../indexes/creating-and-deploying#auto-indexes)  
+- [Static Indexes](../../indexes/creating-and-deploying#static-indexes)  
+- [Boosting](../../indexes/boosting)
+- [Dynamic Fields](../../indexes/using-dynamic-fields)
+- [Storing Data in Index](../../indexes/storing-data-in-index)
+
+### Studio
+- [Index List View](../../studio/database/indexes/indexes-list-view)  
+- [Database Settings](../../studio/database/settings/database-settings)  
+- [Custom Analyzers](../../studio/database/settings/custom-analyzers)  
+
+### Configuration
+- [Configuration Options](../../server/configuration/configuration-options)
+- [Configuration: Indexing](../../server/configuration/indexing-configuration)
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.png
new file mode 100644
index 0000000000..240bb5878c
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snag
new file mode 100644
index 0000000000..18d61338e5
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snagx
new file mode 100644
index 0000000000..7efe3cfc19
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-01_search-engine-changed.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.png
new file mode 100644
index 0000000000..80256fcfc4
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snag
new file mode 100644
index 0000000000..601f75a26e
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snagx
new file mode 100644
index 0000000000..916b187d0f
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-02_index-definition.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.png
new file mode 100644
index 0000000000..b4929dfe0f
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snag
new file mode 100644
index 0000000000..c3a5b171ee
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snagx
new file mode 100644
index 0000000000..de28c106e5
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-03_index-definition_searcher-select.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.png
new file mode 100644
index 0000000000..3876108f36
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snag
new file mode 100644
index 0000000000..a09c61665b
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snagx
new file mode 100644
index 0000000000..b41cc3e6bb
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-04_database-settings_01.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.png
new file mode 100644
index 0000000000..6ccc9efa6a
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snag
new file mode 100644
index 0000000000..2d7bbb50cf
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snagx
new file mode 100644
index 0000000000..6160e4dc87
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-05_database-settings_02.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.png
new file mode 100644
index 0000000000..32d374068f
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snag
new file mode 100644
index 0000000000..10ddf07d68
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snagx
new file mode 100644
index 0000000000..737ed8c032
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-06_database-settings_03.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.png
new file mode 100644
index 0000000000..6c76c8cd5a
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snag
new file mode 100644
index 0000000000..debcee95e9
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snagx
new file mode 100644
index 0000000000..959cfe0171
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-07_exception-method-not-implemented.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.png b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.png
new file mode 100644
index 0000000000..2d7b18cad3
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snag b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snag
new file mode 100644
index 0000000000..2a8cdb247d
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snagx b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snagx
new file mode 100644
index 0000000000..92d9dfde19
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/indexes/search-engine/images/corax-08_disable-indexing-of-nested-field.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/.docs.json b/Documentation/6.1/Raven.Documentation.Pages/migration/.docs.json
index 3b1c7d530a..9e5d37641f 100644
--- a/Documentation/6.1/Raven.Documentation.Pages/migration/.docs.json
+++ b/Documentation/6.1/Raven.Documentation.Pages/migration/.docs.json
@@ -8,5 +8,10 @@
         "Path": "/server",
         "Name": "Server",
         "Mappings": []
+    },
+    {
+        "Path": "/embedded",
+        "Name": "Embedded",
+        "Mappings": []
     }
 ]
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/client-api/client-breaking-changes.markdown b/Documentation/6.1/Raven.Documentation.Pages/migration/client-api/client-breaking-changes.markdown
new file mode 100644
index 0000000000..7d8d176e0f
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/migration/client-api/client-breaking-changes.markdown
@@ -0,0 +1,150 @@
+# Migration: Client Breaking Changes
+---
+
+{NOTE: }
+The features listed in this page were available in former RavenDB versions.  
+In RavenDB `6.1.x`, they are either unavailable or their behavior is inconsistent 
+with their behavior in previous versions.  
+
+* In this page:
+   * [`CounterBatchOperation` default increment Delta is 1](../../migration/client-api/client-breaking-changes#counterbatchoperation-default-increment-delta-is-1)  
+   * [CmpXchg item can only be created with an index of 0](../../migration/client-api/client-breaking-changes#cmpxchg-item-can-only-be-created-with-an-index-of-0)  
+   * [Dynamic Linq query cannot apply `.Any` with logical AND (`&&`)](../../migration/client-api/client-breaking-changes#dynamic-linq-query-cannot-apply-.any-with-logical-and-(&&))  
+   * [`LoadDocument` must be provided with a collection name string](../../migration/client-api/client-breaking-changes#loaddocument-must-be-provided-with-a-collection-name-string)  
+   * [Tracking operations using the Changes API now requires Node Tag](../../migration/client-api/client-breaking-changes#tracking-operations-using-the-changes-api-now-requires-node-tag)  
+   * [Consistency in `null` handling](../../migration/client-api/client-breaking-changes#consistency-in-null-handling)  
+
+{NOTE/}
+
+---
+
+{PANEL: `CounterBatchOperation` default increment Delta is 1}
+
+When [CounterBatchOperation](../../client-api/operations/counters/counter-batch) is 
+called to `Increment` a batch of counters, and no `Delta` is specified to indicate 
+what value should be added to the counters, the operation will increment the counters 
+by a default `Delta`.  
+
+  * Previous RavenDB versions set a default `Delta` of `0`, leaving the counters value unchanged.  
+  * Starting RavenDB `6.1` the default `Delta` is `1` to make it consistent with the rest of the API.  
+
+{CODE:csharp CounterBatchOperation@migration\BreakingChanges.cs /}
+
+{PANEL/}
+
+{PANEL: CmpXchg item can only be created with an index of 0}
+
+Creating a [compare exchange item](../../client-api/operations/compare-exchange/put-compare-exchange-value) 
+using `PutCompareExchangeValueOperation` is now possible only if the `index` parameter 
+passed to the method is `0`.  
+
+{CODE:csharp CmpXchg@migration\BreakingChanges.cs /}  
+
+{PANEL/}
+
+{PANEL: Dynamic Linq query cannot apply `.Any` with logical AND (`&&`)}
+
+RavenDB does not support dynamic Linq queries (i.e. queries executed over auto indexes) 
+when they attempt to apply multiple conditions using the `.Any` method with a logical AND (`&&`).  
+The below query, for example, is *not supported*.  
+
+{CODE-BLOCK:sql}
+using (var store = new DocumentStore())
+{
+    var guestsCarryingSmallSilverSuitcases = session.Query<Guest>()
+        // Applying .Any with && is not supported
+        .Where(x => x.Suitcase.Any(p => p.Size == "Small" && p.Color == "Silver"))
+        .ToList();
+}
+{CODE-BLOCK/}
+
+{INFO: }
+While _auto_ indexes do not currently support this type of query, _static_ indexes do.  
+You can define a **static fanout index** that creates separate index entries for different 
+document sub-objects, and run your query over these entries.  
+Read about the indexing of nested data [here](../../indexes/indexing-nested-data),  
+and find explanations and samples for fanout indexes [here](../../indexes/indexing-nested-data#fanout-index---multiple-index-entries-per-document).  
+{INFO/}
+
+{PANEL/}
+
+{PANEL: `LoadDocument` must be provided with a collection name String}
+
+When [LoadDocument](../../indexes/indexing-related-documents) is used in an index query 
+to load related documents, it is passed a **document ID** and a **collection name**.  
+
+The collection name **must** be passed to `LoadDocument` as a regular string; attempting 
+to pass it a dynamic expression instead of a string will fail with an `IndexCompilationException` 
+exception and this message: `LoadDocument method has to be called with constant value as collection name`
+
+The following query, for example, will fail because it attempts to build the collection name dynamically.  
+
+{CODE-BLOCK:sql}
+from doc in docs.Orders
+select new {
+    // This attempt to construct a collection name will fail with an exception
+    CompanyName = LoadDocument(doc.Company, doc.Company.Split('/')[0]).Name
+}
+{CODE-BLOCK/}
+
+{NOTE: }
+Note that the validation of the collection name string will be forced only during 
+the creation of a **new** index. 
+An attempt to update an existing index with a collection name expression rather 
+than a string will fail but the failure will remain unnoticed and an exception 
+will not be thrown.
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Tracking operations using the Changes API now requires Node Tag}
+
+[Tracking operations using the changes API](../../client-api/changes/how-to-subscribe-to-operation-changes) 
+now requires that you pass the changes API both a database name **and** a node tag for the specific node that 
+runs the operation/s you want to track, to ensure that the API consistently tracks this selected node.  
+
+The changes API can be opened using two `Changes` overloads. The first passes the API only the database name 
+and is capable of tracking all entities besides operations. Attempting to track operations after opening the 
+API this way will fail with an `ArgumentException` exception and the following message:  
+`"Changes API must be provided a node tag in order to track node-specific operations."`
+
+To track operations, open the API using this overload:  
+{CODE:csharp changes-definition@migration\BreakingChanges.cs /}  
+
+Then, you can use `ForOperationId` or `ForAllOperations` to track a certain operation or all 
+the operations executed by the selected node. Here's a simple usage example:  
+{CODE:csharp changes_ForOperationId@migration\BreakingChanges.cs /}  
+ 
+{PANEL/}
+
+{PANEL: Consistency in `null` handling}
+
+`IAsyncDocumentSession.LoadAsync` and `IAsyncLazySessionsOperations.LoadAsync` now 
+do not throw an exception when they are passed `null`, becoming consistent with the 
+behavior of the majority of RavenDB's methods.  
+
+{CODE-BLOCK:csharp}
+// This will work without issues
+IAsyncDocumentSession.LoadAsync(null)
+{CODE-BLOCK/}
+
+{PANEL/}
+
+## Related Articles
+
+### Counters
+- [Counters](../../document-extensions/counters/overview)  
+- [CounterBatchOperation](../../client-api/operations/counters/counter-batch)  
+
+### Compare Exchange
+- [Compare Exchange](../../client-api/operations/compare-exchange/overview)  
+- [Put compare exchange op](../../client-api/operations/compare-exchange/put-compare-exchange-value)  
+
+### Querying
+- [Query Overview](../../client-api/session/querying/how-to-query) 
+- [What is RQL](../../client-api/session/querying/what-is-rql)  
+
+### Indexes
+- [What are Indexes](../../indexes/what-are-indexes)  
+- [Indexing Basics](../../indexes/indexing-basics)  
+- [LoadDocument](../../indexes/indexing-related-documents)  
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/.docs.json b/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/.docs.json
new file mode 100644
index 0000000000..7e17d96bc3
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/.docs.json
@@ -0,0 +1,8 @@
+[
+  {
+    "Path": "testdriver-breaking-changes.markdown",
+    "Name": "TestDriver Breaking Changes",
+    "DiscussionId": "a65e73a1-5b7e-483d-bd5c-e4d3b9fc1992",
+    "Mappings": []
+  }
+]
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/testdriver-breaking-changes.markdown b/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/testdriver-breaking-changes.markdown
new file mode 100644
index 0000000000..ee9e9244d1
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/migration/embedded/testdriver-breaking-changes.markdown
@@ -0,0 +1,71 @@
+# Embedded Server: TestDriver Breaking Changes
+---
+
+{NOTE: }
+The features listed in this page were available in former RavenDB versions.  
+In RavenDB `6.1.x`, they are either unavailable or their behavior is inconsistent 
+with their behavior in previous versions.  
+
+* In this page:  
+   * [Unlicensed TestDriver throws an exception](../../migration/embedded/testdriver-breaking-changes#unlicensed-testdriver-throws-an-exception)  
+
+{NOTE/}
+
+---
+
+{PANEL: Unlicensed TestDriver throws an exception}
+
+### Background:
+
+The [RavenDB.TestDriver](https://www.nuget.org/packages/RavenDB.TestDriver/) package 
+allows users to create [unit tests](../../start/test-driver) for their applications, 
+and run the tests using an [embedded server](../../server/embedded) included in the package.  
+
+Like other types of RavenDB server, the features that an embedded server supports 
+and the resources it can use are defined by its [license](https://ravendb.net/buy).  
+An unlicensed server, for example, can use only 3 CPU cores, while a server 
+licensed using a [free developers license](https://ravendb.net/buy#developer) 
+can use up to 9 cores and run way faster.  
+
+RavenDB `5.4` introduced the `ThrowOnInvalidOrMissingLicense` exception, thrown 
+if TestDriver runs using an unlicensed server to notify users that they may miss out 
+on much of their system's potential.  
+A `TestServerOptions.Licensing.ThrowOnInvalidOrMissingLicense` flag was introduced 
+along with the exception, determining whether to throw the exception or not when the 
+server is used without a license.  
+
+In version `5.4`, the default value for this flag was `false`, disabling the exception 
+even if the server is unlicensed. For an exception to be thrown, users needed to change 
+the flag to `true` on their own initiative.  
+
+### The breaking change:
+
+In version `6.1`, the default value given to `TestServerOptions.Licensing.ThrowOnInvalidOrMissingLicense` 
+has **changed** to `true`; a `ThrowOnInvalidOrMissingLicense` exception **would** 
+be thrown if TestDriver runs with an embedded server that hasn't been provided with 
+a license yet.  
+
+Users that prefer not to license their embedded server for some reason can disable 
+the exception by setting the flag to `false`. TestDriver tests will still run, but 
+the server's capabilities will be limited to those defined by the basic 
+[AGPL](https://ravendb.net/legal/ravendb/commercial-license-eula) license.  
+
+{PANEL/}
+
+## Related Articles
+
+### Changes API
+- [Changes API](../../client-api/changes/what-is-changes-api)  
+- [Tracking operations](../../client-api/changes/how-to-subscribe-to-operation-changes)  
+
+### Studio
+- [Identity parts separator](../../studio/server/client-configuration#set-the-client-configuration-(server-wide))  
+- [SQL connection string](../../studio/database/tasks/import-data/import-from-sql#create-a-new-import-configuration)  
+
+### Server
+- [ID Generation](../../server/kb/document-identifier-generation#id-generation-by-server)
+
+### Corax
+- [Corax](../../indexes/search-engine/corax)  
+- [Complex fields](../../indexes/search-engine/corax#handling-of-complex-json-objects)  
+- [Auto indexes](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing)  
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.png b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.png
new file mode 100644
index 0000000000..acac253609
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.snagx b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.snagx
new file mode 100644
index 0000000000..0759c0edfe
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_SQL-ETL-task.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.png b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.png
new file mode 100644
index 0000000000..77938c0ae6
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.snag b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.snag
new file mode 100644
index 0000000000..a855aa56f2
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator1.snagx b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator1.snagx
new file mode 100644
index 0000000000..b3f8b5ab55
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_identity-parts-separator1.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.png b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.png
new file mode 100644
index 0000000000..513a9b2d74
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.png differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snag b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snag
new file mode 100644
index 0000000000..1c852b5d4c
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snag differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snagx b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snagx
new file mode 100644
index 0000000000..41594aa2ad
Binary files /dev/null and b/Documentation/6.1/Raven.Documentation.Pages/migration/server/images/breaking-changes_new-separator.snagx differ
diff --git a/Documentation/6.1/Raven.Documentation.Pages/migration/server/server-breaking-changes.markdown b/Documentation/6.1/Raven.Documentation.Pages/migration/server/server-breaking-changes.markdown
new file mode 100644
index 0000000000..3f88a21864
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/migration/server/server-breaking-changes.markdown
@@ -0,0 +1,120 @@
+# Migration: Server Breaking Changes
+---
+
+{NOTE: }
+The features listed in this page were available in former RavenDB versions.  
+In RavenDB `6.1.x`, they are either unavailable or their behavior is inconsistent 
+with their behavior in previous versions.  
+
+* In this page:  
+   * [MSSQL connection string requires an Encrypt property](../../migration/server/server-breaking-changes#mssql-connection-string-requires-an-encrypt-property)  
+   * [Corax handling of complex JSON objects in static indexes is configurable](../../migration/server/server-breaking-changes#corax-handling-of-complex-json-objects-in-static-indexes-is-configurable)  
+   * [Customizable identifier parts separator](../../migration/server/server-breaking-changes#customizable-identifier-parts-separator)  
+
+{NOTE/}
+
+---
+
+{PANEL: MSSQL connection string requires an Encrypt property}
+
+To establish a connection with an MSSQL server via ETL, RavenDB is required 
+by the `Microsoft.Data.SqlClient` package it utilizes (which replaces the 
+deprecated `System.Data.SqlClient` package we've been using in previous versions) 
+to include in its connection string an `Encrypt` property that would determine 
+whether to encrypt the connection or not.  
+
+RavenDB versions preceding `6.1` (down to `6.0.105`) added this property 
+to their connection strings without bothering their users, setting it to 
+[Encrypt=Optional](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlconnectionencryptoption.optional?view=sqlclient-dotnet-standard-5.2#microsoft-data-sqlclient-sqlconnectionencryptoption-optional) 
+and leaving the connection unencrypted unless users set it differently on 
+their own accord.  
+From RavenDB 6.1 on, we no longer include this property in MSSQL connection 
+strings and users are required to explicitly choose whether to encrypt the 
+connection or not.  
+
+You can go on using [Encrypt=Optional](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlconnectionencryptoption.optional?view=sqlclient-dotnet-standard-5.2#microsoft-data-sqlclient-sqlconnectionencryptoption-optional) 
+and leave your connection unencrypted, or include [Encrypt=Mandatory](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlconnectionencryptoption.mandatory?view=sqlclient-dotnet-standard-5.2#microsoft-data-sqlclient-sqlconnectionencryptoption-mandatory) 
+or [Encrypt=Strict](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlconnectionencryptoption.strict?view=sqlclient-dotnet-standard-5.2#microsoft-data-sqlclient-sqlconnectionencryptoption-strict) 
+in your connection string and provide the server you use with a valid certificate to encrypt the connection.  
+
+Provide the connection string using code 
+([like so](../../client-api/operations/maintenance/connection-strings/add-connection-string#add-an-sql-connection-string)) 
+or via Studio:  
+
+![SQL ETL task](images/breaking-changes_SQL-ETL-task.png "SQL ETL task")
+
+{PANEL/}
+
+{PANEL: Corax handling of complex JSON objects in static indexes is configurable}
+
+The behavior of RavenDB's [Corax](../../indexes/search-engine/corax) search engine while 
+handling [complex JSON objects](../../indexes/search-engine/corax#handling-of-complex-json-objects) 
+in **static indexes** is now configurable using the `Indexing.Corax.Static.ComplexFieldIndexingBehavior` 
+configuration option (the [handling of auto indexes](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+remains unchanged).  
+
+* By default, `ComplexFieldIndexingBehavior` is set to **`Throw`**, instructing the search 
+  engine to throw a [NotSupportedInCoraxException](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+  exception when it encounters a complex field in a static index.  
+
+* If you prefer it, you can set `ComplexFieldIndexingBehavior` to **`Skip`** to disable the 
+  indexing of complex fields without throwing an exception or raising a notification.  
+
+{INFO: }
+
+* The configuration option will apply only to [new static indexes](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing), 
+  created after the release of RavenDB `6.1`. It will not affect older indexes.  
+* [ComplexFieldIndexingBehavior](../../server/configuration/indexing-configuration#indexing.corax.static.complexfieldindexingbehavior) 
+  can be set for a particular index as well as for all indexes.  
+* Though complex fields cannot be indexed, they **can** still be [stored and projected](../../indexes/search-engine/corax#revise-index-definition-and-fields-usage).  
+* To search by the contents of a static index's complex field, you can convert 
+  it to a string (using `ToString` on the field value in the index definition). 
+  It is recommended, though, to index [individual properties](../../indexes/search-engine/corax#index-a-simple-property-contained-in-the-complex-field) 
+  of the complex field.  
+
+{INFO/}
+
+{PANEL/}
+
+{PANEL: Customizable identifier parts separator}
+
+Picking an [identifier parts separator](../../server/kb/document-identifier-generation#id-generation-by-server) 
+allows you to choose which character would be placed as a separator between ID parts 
+when new documents are given their IDs.  
+
+This configuration is available in the database level as well as server-wide, but in 
+versions lower than RavenDB `6.1` its server-wide level wasn't implemented even if 
+a new separator was selected.  
+
+RavenDB `6.1` applies your identifier parts separator selection in the server-wide level 
+as well. This means that if you selected a separator in a RavenDB version lower than `6.1` 
+and you now migrate to `6.1`, your selected separator **will become active**.  
+
+Please be aware of this change and check this setting before migrating.  
+
+![Identity parts separator](images/breaking-changes_identity-parts-separator.png "Identity parts separator")
+
+After making this change, creating a new document with the identity prefix `|`, e.g. `user|`, 
+will apply your new separator.  
+
+![New separator](images/breaking-changes_new-separator.png "New separator")
+
+{PANEL/}
+
+## Related Articles
+
+### Changes API
+- [Changes API](../../client-api/changes/what-is-changes-api)  
+- [Tracking operations](../../client-api/changes/how-to-subscribe-to-operation-changes)  
+
+### Studio
+- [Identity parts separator](../../studio/server/client-configuration#set-the-client-configuration-(server-wide))  
+- [SQL connection string](../../studio/database/tasks/import-data/import-from-sql#create-a-new-import-configuration)  
+
+### Server
+- [ID Generation](../../server/kb/document-identifier-generation#id-generation-by-server)
+
+### Corax
+- [Corax](../../indexes/search-engine/corax)  
+- [Complex fields](../../indexes/search-engine/corax#handling-of-complex-json-objects)  
+- [Auto indexes](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing)  
diff --git a/Documentation/6.1/Raven.Documentation.Pages/server/configuration/indexing-configuration.markdown b/Documentation/6.1/Raven.Documentation.Pages/server/configuration/indexing-configuration.markdown
new file mode 100644
index 0000000000..6d83d06a98
--- /dev/null
+++ b/Documentation/6.1/Raven.Documentation.Pages/server/configuration/indexing-configuration.markdown
@@ -0,0 +1,948 @@
+# Configuration: Indexing
+---
+
+{NOTE: }
+
+* The below **indexing configuration keys** can be modified via any of the following methods:
+    * As explained in the [Config overview](../../server/configuration/configuration-options) article
+    * Set a custom configuration per index from the [Client API](../../indexes/creating-and-deploying#creating-an-index-with-custom-configuration)
+    * Set a custom configuration per index from the [Studio](../../studio/database/indexes/create-map-index#configuration)
+
+{NOTE/}
+
+{NOTE: }
+
+* In this page:  
+  * Server-wide scope:  
+    [Indexing.CleanupIntervalInMin](../../server/configuration/indexing-configuration#indexing.cleanupintervalinmin)  
+    [Indexing.GlobalScratchSpaceLimitInMb](../../server/configuration/indexing-configuration#indexing.globalscratchspacelimitinmb)  
+    [Indexing.MaxNumberOfConcurrentlyRunningIndexes](../../server/configuration/indexing-configuration#indexing.maxnumberofconcurrentlyrunningindexes)  
+    [Indexing.MaxTimeToWaitAfterFlushAndSyncWhenExceedingScratchSpaceLimitInSec](../../server/configuration/indexing-configuration#indexing.maxtimetowaitafterflushandsyncwhenexceedingscratchspacelimitinsec)  
+    [Indexing.NuGetAllowPreReleasePackages](../../server/configuration/indexing-configuration#indexing.nugetallowprereleasepackages)  
+    [Indexing.NuGetPackageSourceUrl](../../server/configuration/indexing-configuration#indexing.nugetpackagesourceurl)  
+    [Indexing.NuGetPackagesPath](../../server/configuration/indexing-configuration#indexing.nugetpackagespath)  
+    [Indexing.QueryClauseCache.ExpirationScanFrequencyInSec](../../server/configuration/indexing-configuration#indexing.queryclausecache.expirationscanfrequencyinsec)  
+    [Indexing.QueryClauseCache.RepeatedQueriesCount](../../server/configuration/indexing-configuration#indexing.queryclausecache.repeatedqueriescount)  
+    [Indexing.QueryClauseCache.SizeInMb](../../server/configuration/indexing-configuration#indexing.queryclausecache.sizeinmb)  
+  * Server-wide, or database scope:  
+    [Indexing.Auto.ArchivedDataProcessingBehavior](../../server/configuration/indexing-configuration#indexing.auto.archiveddataprocessingbehavior)  
+    [Indexing.Auto.DeploymentMode](../../server/configuration/indexing-configuration#indexing.auto.deploymentmode)  
+    [Indexing.Auto.SearchEngineType](../../server/configuration/indexing-configuration#indexing.auto.searchenginetype)  
+    [Indexing.Disable](../../server/configuration/indexing-configuration#indexing.disable)  
+    [Indexing.DisableQueryOptimizerGeneratedIndexes](../../server/configuration/indexing-configuration#indexing.disablequeryoptimizergeneratedindexes)  
+    [Indexing.ErrorIndexStartupBehavior](../../server/configuration/indexing-configuration#indexing.errorindexstartupbehavior)  
+    [Indexing.History.NumberOfRevisions](../../server/configuration/indexing-configuration#indexing.history.numberofrevisions)  
+    [Indexing.IndexStartupBehavior](../../server/configuration/indexing-configuration#indexing.indexstartupbehavior)  
+    [Indexing.RunInMemory](../../server/configuration/indexing-configuration#indexing.runinmemory)  
+    [Indexing.SkipDatabaseIdValidationOnIndexOpening](../../server/configuration/indexing-configuration#indexing.skipdatabaseidvalidationonindexopening)  
+    [Indexing.Static.ArchivedDataProcessingBehavior](../../server/configuration/indexing-configuration#indexing.static.archiveddataprocessingbehavior)  
+    [Indexing.Static.DeploymentMode](../../server/configuration/indexing-configuration#indexing.static.deploymentmode)  
+    [Indexing.Static.RequireAdminToDeployJavaScriptIndexes](../../server/configuration/indexing-configuration#indexing.static.requireadmintodeployjavascriptindexes)  
+    [Indexing.TempPath](../../server/configuration/indexing-configuration#indexing.temppath)  
+    [Indexing.TimeBeforeDeletionOfSupersededAutoIndexInSec](../../server/configuration/indexing-configuration#indexing.timebeforedeletionofsupersededautoindexinsec)  
+    [Indexing.TimeToWaitBeforeDeletingAutoIndexMarkedAsIdleInHrs](../../server/configuration/indexing-configuration#indexing.timetowaitbeforedeletingautoindexmarkedasidleinhrs)  
+    [Indexing.TimeToWaitBeforeMarkingAutoIndexAsIdleInMin](../../server/configuration/indexing-configuration#indexing.timetowaitbeforemarkingautoindexasidleinmin)  
+  * Server-wide, or database, or per index:  
+    [Indexing.Analyzers.Default](../../server/configuration/indexing-configuration#indexing.analyzers.default)  
+    [Indexing.Analyzers.Exact.Default](../../server/configuration/indexing-configuration#indexing.analyzers.exact.default)  
+    [Indexing.Analyzers.Search.Default](../../server/configuration/indexing-configuration#indexing.analyzers.search.default)  
+    [Indexing.Corax.DocumentsLimitForCompressionDictionaryCreation](../../server/configuration/indexing-configuration#indexing.corax.documentslimitforcompressiondictionarycreation)  
+    [Indexing.Corax.IncludeDocumentScore](../../server/configuration/indexing-configuration#indexing.corax.includedocumentscore)  
+    [Indexing.Corax.IncludeSpatialDistance](../../server/configuration/indexing-configuration#indexing.corax.includespatialdistance)  
+    [Indexing.Corax.MaxAllocationsAtDictionaryTrainingInMb](../../server/configuration/indexing-configuration#indexing.corax.maxallocationsatdictionarytraininginmb)  
+    [Indexing.Corax.MaxMemoizationSizeInMb](../../server/configuration/indexing-configuration#indexing.corax.maxmemoizationsizeinmb)  
+    [Indexing.Corax.Static.ComplexFieldIndexingBehavior](../../server/configuration/indexing-configuration#indexing.corax.static.complexfieldindexingbehavior)  
+    [Indexing.Encrypted.TransactionSizeLimitInMb](../../server/configuration/indexing-configuration#indexing.encrypted.transactionsizelimitinmb)  
+    [Indexing.IndexEmptyEntries](../../server/configuration/indexing-configuration#indexing.indexemptyentries)  
+    [Indexing.IndexMissingFieldsAsNull](../../server/configuration/indexing-configuration#indexing.indexmissingfieldsasnull)  
+    [Indexing.Lucene.Analyzers.NGram.MaxGram](../../server/configuration/indexing-configuration#indexing.lucene.analyzers.ngram.maxgram)  
+    [Indexing.Lucene.Analyzers.NGram.MinGram](../../server/configuration/indexing-configuration#indexing.lucene.analyzers.ngram.mingram)  
+    [Indexing.Lucene.IndexInputType](../../server/configuration/indexing-configuration#indexing.lucene.indexinputtype)  
+    [Indexing.Lucene.LargeSegmentSizeToMergeInMb](../../server/configuration/indexing-configuration#indexing.lucene.largesegmentsizetomergeinmb)  
+    [Indexing.Lucene.MaximumSizePerSegmentInMb](../../server/configuration/indexing-configuration#indexing.lucene.maximumsizepersegmentinmb)  
+    [Indexing.Lucene.MaxTimeForMergesToKeepRunningInSec](../../server/configuration/indexing-configuration#indexing.lucene.maxtimeformergestokeeprunninginsec)  
+    [Indexing.Lucene.MergeFactor](../../server/configuration/indexing-configuration#indexing.lucene.mergefactor)  
+    [Indexing.Lucene.NumberOfLargeSegmentsToMergeInSingleBatch](../../server/configuration/indexing-configuration#indexing.lucene.numberoflargesegmentstomergeinsinglebatch)  
+    [Indexing.Lucene.ReaderTermsIndexDivisor](../../server/configuration/indexing-configuration#indexing.lucene.readertermsindexdivisor)  
+    [Indexing.Lucene.UseCompoundFileInMerging](../../server/configuration/indexing-configuration#indexing.lucene.usecompoundfileinmerging)  
+    [Indexing.ManagedAllocationsBatchSizeLimitInMb](../../server/configuration/indexing-configuration#indexing.managedallocationsbatchsizelimitinmb)  
+    [Indexing.MapBatchSize](../../server/configuration/indexing-configuration#indexing.mapbatchsize)  
+    [Indexing.MapTimeoutAfterEtagReachedInMin](../../server/configuration/indexing-configuration#indexing.maptimeoutafteretagreachedinmin)  
+    [Indexing.MapTimeoutInSec](../../server/configuration/indexing-configuration#indexing.maptimeoutinsec)  
+    [Indexing.MaxStepsForScript](../../server/configuration/indexing-configuration#indexing.maxstepsforscript)  
+    [Indexing.MaxTimeForDocumentTransactionToRemainOpenInSec](../../server/configuration/indexing-configuration#indexing.maxtimefordocumenttransactiontoremainopeninsec)  
+    [Indexing.MaxTimeToWaitAfterFlushAndSyncWhenReplacingSideBySideIndexInSec](../../server/configuration/indexing-configuration#indexing.maxtimetowaitafterflushandsyncwhenreplacingsidebysideindexinsec)  
+    [Indexing.Metrics.Enabled](../../server/configuration/indexing-configuration#indexing.metrics.enabled)   
+    [Indexing.MinNumberOfMapAttemptsAfterWhichBatchWillBeCanceledIfRunningLowOnMemory](../../server/configuration/indexing-configuration#indexing.minnumberofmapattemptsafterwhichbatchwillbecanceledifrunninglowonmemory)   
+    [Indexing.MinimumTotalSizeOfJournalsToRunFlushAndSyncWhenReplacingSideBySideIndexInMb](../../server/configuration/indexing-configuration#indexing.minimumtotalsizeofjournalstorunflushandsyncwhenreplacingsidebysideindexinmb)
+    [Indexing.NumberOfConcurrentStoppedBatchesIfRunningLowOnMemory](../../server/configuration/indexing-configuration#indexing.numberofconcurrentstoppedbatchesifrunninglowonmemory)   
+    [Indexing.NumberOfLargeSegmentsToMergeInSingleBatch](../../server/configuration/indexing-configuration#indexing.numberoflargesegmentstomergeinsinglebatch)  
+    [Indexing.OrderByScoreAutomaticallyWhenBoostingIsInvolved](../../server/configuration/indexing-configuration#indexing.orderbyscoreautomaticallywhenboostingisinvolved)  
+    [Indexing.OrderByTicksAutomaticallyWhenDatesAreInvolved](../../server/configuration/indexing-configuration#indexing.orderbyticksautomaticallywhendatesareinvolved)  
+    [Indexing.QueryClauseCache.Disabled](../../server/configuration/indexing-configuration#indexing.queryclausecache.disabled)  
+    [Indexing.QueryClauseCache.RepeatedQueriesTimeFrameInSec](../../server/configuration/indexing-configuration#indexing.queryclausecache.repeatedqueriestimeframeinsec)  
+    [Indexing.ScratchSpaceLimitInMb](../../server/configuration/indexing-configuration#indexing.scratchspacelimitinmb)  
+    [Indexing.Static.SearchEngineType](../../server/configuration/indexing-configuration#indexing.static.searchenginetype)  
+    [Indexing.Throttling.TimeIntervalInMs](../../server/configuration/indexing-configuration#indexing.throttling.timeintervalinms)  
+    [Indexing.TimeSinceLastQueryAfterWhichDeepCleanupCanBeExecutedInMin](../../server/configuration/indexing-configuration#indexing.timesincelastqueryafterwhichdeepcleanupcanbeexecutedinmin)  
+    [Indexing.TransactionSizeLimitInMb](../../server/configuration/indexing-configuration#indexing.transactionsizelimitinmb)  
+
+{NOTE/}
+
+---
+
+{PANEL: Indexing.CleanupIntervalInMin}
+
+Time (in minutes) between auto index cleanup.
+Time (in minutes) between index cleanup"
+
+- **Type**: `int`
+- **Default**: `10`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.GlobalScratchSpaceLimitInMb}
+
+* Maximum amount of scratch space in megabytes that we allow to use for all index storages per server.
+
+* After exceeding this limit the indexes will complete their current indexing batches and force flush and sync storage environments.
+
+---
+
+- **Type**: `int`
+- **Default**: `null` (no limit)
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.MaxNumberOfConcurrentlyRunningIndexes}
+
+Set how many indexes can run concurrently on the server to prevent overwhelming system resources and slow indexing.
+
+- **Type**: `int`
+- **Default**: `null` (No limit)
+- **MinValue**: 1
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.MaxTimeToWaitAfterFlushAndSyncWhenExceedingScratchSpaceLimitInSec}
+
+Max time to wait in seconds when forcing the storage environment flush and sync after exceeding the scratch space limit.
+
+- **Type**: `int`
+- **Default**: `30`
+- **Scope**: Server-wide only
+- **Alias:** `Indexing.MaxTimeToWaitAfterFlushAndSyncWhenExceedingScratchSpaceLimit`
+
+{PANEL/}
+
+{PANEL: Indexing.NuGetAllowPreReleasePackages}
+
+Allow installation of NuGet prerelease packages.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide only
+- **Alias:** `Indexing.NuGetAllowPreleasePackages`
+
+{PANEL/}
+
+{PANEL: Indexing.NuGetPackageSourceUrl}
+
+Default NuGet source URL.
+
+- **Type**: `string`
+- **Default**: `https://api.nuget.org/v3/index.json`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.NuGetPackagesPath}
+
+Location of NuGet packages cache.
+
+- **Type**: `string`
+- **Default**: `Packages/NuGet`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.QueryClauseCache.ExpirationScanFrequencyInSec}
+
+EXPERT ONLY:  
+The frequency by which to scan the query clause cache for expired values.
+
+- **Type**: `int`
+- **Default**: `180`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.QueryClauseCache.RepeatedQueriesCount}
+
+EXPERT ONLY:  
+The number of recent queries that we will keep to identify repeated queries, relevant for caching.
+
+- **Type**: `int`
+- **Default**: `512`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.QueryClauseCache.SizeInMb}
+
+EXPERT ONLY:
+
+* Maximum size that the query clause cache will utilize for caching partial query clauses,  
+  defaulting to 10% of the system memory on 64-bit machines.
+
+* The default value, which is determined based on your platform details, is set by the constructor of class `IndexingConfiguration`.
+
+---
+
+- **Type**: `int`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide only
+
+{PANEL/}
+
+{PANEL: Indexing.Auto.ArchivedDataProcessingBehavior}
+
+Set the default deployment mode for static indexes.
+
+- **Type**: `enum IndexDeploymentModeArchivedDataProcessingBehavior` (`ExcludeArchived`, `IncludeArchived`, `ArchivedOnly`)
+- **Default**: `ExcludeArchived`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.Auto.DeploymentMode}
+
+Set the default deployment mode for auto indexes.
+
+- **Type**: `enum IndexDeploymentMode` (`Parallel`, `Rolling`)
+- **Default**: `Parallel`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.Auto.SearchEngineType}
+
+Set the search engine to be used with auto-indexes.
+
+- **Type**: `enum SearchEngineType` (`Lucene`, `Corax`)
+- **Default**: `Lucene`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.Disable}
+
+Set whether to disable all indexes in the database.  
+All indexes in the database will be disabled when set to `true`.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.DisableQueryOptimizerGeneratedIndexes}
+
+EXPERT ONLY:  
+Disable query optimizer generated indexes (auto-indexes). Dynamic queries will not be supported.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.ErrorIndexStartupBehavior}
+
+Set how faulty indexes should behave on database startup when they are loaded.  
+By default they are not started.
+
+- **Type**: `enum ErrorIndexStartupBehaviorType` (`Default`, `Start`, `ResetAndStart`)
+- **Default**: `Default`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL:Indexing.History.NumberOfRevisions}
+
+Number of index history revisions to keep per index.
+
+- **Type**: `int`
+- **Default**: `10`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.IndexStartupBehavior}
+
+* Set how indexes should behave on database startup when they are loaded.  
+  By default they are started immediately.
+
+* Setting this param can prevent slow index startup behavior in scenarios where many indexes open and start processing concurrently, which may cause IO usage to max out system resources.
+
+---
+
+- **Type**: `enum IndexStartupBehaviorType` (`Default`, `Immediate`, `Pause`, `Delay`)
+- **Default**: `Default`
+- **Scope**: Server-wide, or per database
+
+Optional values:
+
+- `Default`: Each index starts as soon as it is loaded.
+- `Immediate`: Same as Default.
+- `Pause`: Loads all indexes, but they are paused until manually started.
+- `Delay`: Delays starting index processes until all indexes are loaded.
+
+{PANEL/}
+
+{PANEL: Indexing.RunInMemory}
+
+* Set if indexes should run purely in memory.
+
+* When running in memory:
+    * No index data is written to the disk, and if the server is restarted, all index data will be lost.
+    * Note that the index definition itself is kept on disk and remains unaffected by server restarts.
+    * This is mostly useful for testing or faster, non-persistent indexing.
+
+* If _Indexing.RunInMemory_ is not set explicitly,  
+  then this configuration key will take the value of the core configuration key [RunInMemory](../../server/configuration/core-configuration#runinmemory).
+
+---
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database
+
+Optional values:
+
+* `true` - indexing is run only in memory
+* `false` - the index data is stored on disk
+
+{PANEL/}
+
+{PANEL: Indexing.SkipDatabaseIdValidationOnIndexOpening}
+
+EXPERT ONLY:  
+Allow to open an index without checking if current Database ID matched the one for which index was created.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, per database
+
+{PANEL/}
+
+{PANEL: Indexing.Static.ArchivedDataProcessingBehavior}
+
+Set the default deployment mode for static indexes.
+
+- **Type**: `enum IndexDeploymentModeArchivedDataProcessingBehavior` (`ExcludeArchived`, `IncludeArchived`, `ArchivedOnly`)
+- **Default**: `ExcludeArchived`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.Static.DeploymentMode}
+
+Set the default deployment mode for static indexes.
+
+- **Type**: `enum IndexDeploymentMode` (`Parallel`, `Rolling`)
+- **Default**: `Parallel`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.Static.RequireAdminToDeployJavaScriptIndexes}
+
+Require database `Admin` [clearance](../../server/security/authorization/security-clearance-and-permissions) to deploy [JavaScript indexes](../../indexes/javascript-indexes).
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.TempPath}
+
+* Use this setting to specify a different path for the indexes' temporary files.
+
+* By default, temporary files are created under the `Temp` directory inside the index data directory.  
+  Learn more about RavenDB directory structure [here](../../server/storage/directory-structure).
+
+---
+
+- **Type**: `string`
+- **Default**: `null`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.TimeBeforeDeletionOfSupersededAutoIndexInSec}
+
+Set the number of seconds to keep a superseded auto index.
+
+- **Type**: `int`
+- **Default**: `15`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.TimeToWaitBeforeDeletingAutoIndexMarkedAsIdleInHrs}
+
+Set the number of hours the database should wait before deleting an auto-index that is marked as idle.
+
+- **Type**: `int`
+- **Default**: `72`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL: Indexing.TimeToWaitBeforeMarkingAutoIndexAsIdleInMin}
+
+Set the number of minutes to wait before marking an auto index as idle.
+
+- **Type**: `int`
+- **Default**: `30`
+- **Scope**: Server-wide, or per database
+
+{PANEL/}
+
+{PANEL:Indexing.Analyzers.Default}
+
+[Default analyzer](../../indexes/using-analyzers#ravendb) that will be used for fields.
+
+- **Type**: `string`
+- **Default**: `LowerCaseKeywordAnalyzer`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL:Indexing.Analyzers.Exact.Default}
+
+[Default analyzer](../../indexes/using-analyzers#ravendb) that will be used for exact fields.
+
+- **Type**: `string`
+- **Default**: `KeywordAnalyzer`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Analyzers.Search.Default}
+
+[Default analyzer](../../indexes/using-analyzers#ravendb) that will be used for search fields.
+
+- **Type**: `string`
+- **Default**: `RavenStandardAnalyzer`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.DocumentsLimitForCompressionDictionaryCreation}
+
+Corax index compression max documents used for dictionary creation.
+
+- **Type**: `int`
+- **Default**: `100_000`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.IncludeDocumentScore}
+
+Include score value in the metadata when sorting by score.  
+Disabling this option could enhance query performance.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.IncludeSpatialDistance}
+
+Include spatial information in the metadata when sorting by distance.  
+Disabling this option could enhance query performance.
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.MaxAllocationsAtDictionaryTrainingInMb}
+
+EXPERT ONLY:
+
+* The maximum amount of megabytes that we'll allocate for training indexing dictionaries.
+
+* The default value, which is determined based on your platform details, is set by the constructor of class `IndexingConfiguration`.
+
+---
+
+- **Type**: `int`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.MaxMemoizationSizeInMb}
+
+The maximum amount of memory in megabytes that Corax can use for memoization during query processing.
+
+- **Type**: `int`
+- **Default**: `512`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Corax.Static.ComplexFieldIndexingBehavior}
+
+Set Corax's [default behavior](../../indexes/search-engine/corax#if-corax-encounters-a-complex-property-while-indexing) 
+when a static index is requested to index a complex JSON object.  
+`CoraxComplexFieldIndexingBehavior.Throw` - Corax will throw a `NotSupportedInCoraxException` exception  
+`CoraxComplexFieldIndexingBehavior.Skip` - Corax will skip indexing the complex field without throwing an exception.  
+
+- **Type**: `enum`  
+- **Default**: `CoraxComplexFieldIndexingBehavior.Throw`  
+- **Scope**: Server-wide, or per database, or per index  
+
+{PANEL/}
+
+{PANEL:Indexing.Encrypted.TransactionSizeLimitInMb}
+
+* Transaction size limit in megabytes for _encrypted_ databases, after which an index will stop and complete the current batch.
+
+* The default value, which is determined based on your platform details, is set by the constructor of class `IndexingConfiguration`.
+
+---
+
+- **Type**: `int`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.IndexEmptyEntries}
+
+* Set how the indexing process should handle documents that are missing fields.
+
+* When set to `true`, the indexing process will index documents even if they lack the fields that are supposed to be indexed.
+
+---
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.IndexMissingFieldsAsNull}
+
+* Set how the indexing process should handle fields that are missing.
+
+* When set to `true`, missing fields will be indexed with a `null` value.
+
+---
+
+- **Type**: `bool`
+- **Default**: `false`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.Analyzers.NGram.MaxGram}
+
+* This configuration applies only to the Lucene indexing engine.
+
+* Largest n-gram to generate when NGram analyzer is used.
+
+---
+
+- **Type**: `int`
+- **Default**: `6`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.Analyzers.NGram.MaxGram`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.Analyzers.NGram.MinGram}
+
+* This configuration applies only to the Lucene indexing engine.
+
+* Smallest n-gram to generate when NGram analyzer is used.
+
+---
+
+- **Type**: `int`
+- **Default**: `2`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.Analyzers.NGram.MinGram`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.IndexInputType}
+
+Lucene index input
+
+- **Type**: `enum LuceneIndexInputType` (`Standard`, `Buffered`)
+- **Default**: `Buffered`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.LargeSegmentSizeToMergeInMb}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* The definition of a large segment in MB.  
+  We won't merge more than [Indexing.NumberOfLargeSegmentsToMergeInSingleBatch](../../server/configuration/indexing-configuration#indexing.numberoflargesegmentstomergeinsinglebatch) in a single batch.
+
+* The default value, which is determined based on your platform details, is set by the constructor of class `IndexingConfiguration`.
+
+---
+
+- **Type**: `int`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.LargeSegmentSizeToMergeInMb`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.MaximumSizePerSegmentInMb}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* The maximum size in MB that we'll consider for segments merging.
+
+* The default value, which is determined based on your platform details, is set by the constructor of class `IndexingConfiguration`.
+
+---
+
+- **Type**: `int`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.MaximumSizePerSegmentInMb`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.MaxTimeForMergesToKeepRunningInSec}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* How long will we let merges to run before we close the transaction.
+
+---
+
+- **Type**: `int`
+- **Default**: `15`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.MaxTimeForMergesToKeepRunningInSec`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.MergeFactor}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* Set how often index segments are merged into larger ones.  
+  The merge process will start when the number of segments in an index reaches this number.
+
+* With smaller values, less RAM is used while indexing, and searches on unoptimized indexes are faster, but indexing speed is slower.
+
+---
+
+- **Type**: `int`
+- **Default**: `10`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.MergeFactor`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.NumberOfLargeSegmentsToMergeInSingleBatch}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* Number of large segments defined by [Indexing.LargeSegmentSizeToMergeInMb](../../server/configuration/indexing-configuration#indexing.largesegmentsizetomergeinmb) to merge in a single batch.
+
+---
+
+- **Type**: `int`
+- **Default**: `2`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.NumberOfLargeSegmentsToMergeInSingleBatch`
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.ReaderTermsIndexDivisor}
+
+EXPERT ONLY:  
+Control how many terms we'll keep in the cache for each field.  
+Higher values reduce the memory usage at the expense of increased search time for each term.
+
+- **Type**: `int`
+- **Default**: `1`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Lucene.UseCompoundFileInMerging}
+
+EXPERT ONLY:
+
+* This configuration applies only to the Lucene indexing engine.
+
+* Use compound file in merging.
+
+---
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Scope**: Server-wide, or per database, or per index
+- **Alias:** `Indexing.UseCompoundFileInMerging`
+
+{PANEL/}
+
+{PANEL: Indexing.ManagedAllocationsBatchSizeLimitInMb}
+
+Managed allocations limit in an indexing batch after which the batch will complete and an index will continue by starting a new one.
+
+- **Type**: `int`
+- **Default**: `2048`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MapBatchSize}
+
+Maximum number of documents to be processed by the index per indexing batch.
+
+- **Type**: `int?`
+- **Default**: `null` (no limit)
+- **MinValue**: `128`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MapTimeoutAfterEtagReachedInMin}
+
+* Number of minutes after which mapping will end even if there is more to map.
+
+* This will only be applied if we pass the last etag we saw in the collection when the batch was started.
+
+---
+
+- **Type**: `int`
+- **Default**: `15`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL:Indexing.MapTimeoutInSec}
+
+Number of seconds after which mapping will end even if there is more to map.  
+Using the default value of `-1` will map everything possible in a single batch.
+
+- **Type**: `int`
+- **Default**: `-1`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MaxStepsForScript}
+
+The maximum number of steps in the script execution of a JavaScript index.
+
+- **Type**: `int`
+- **Default**: `10_000`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MaxTimeForDocumentTransactionToRemainOpenInSec}
+
+Set how many seconds indexing will keep document transaction open when indexing.  
+When triggered, transaction will be closed and a new one will be opened.
+
+- **Type**: `int`
+- **Default**: `15`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MaxTimeToWaitAfterFlushAndSyncWhenReplacingSideBySideIndexInSec}
+
+Max time to wait when forcing the storage environment flush and sync when replacing side-by-side index.
+
+- **Type**: `int`
+- **Default**: `30`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Metrics.Enabled}
+
+Set whether indexing performance metrics will be gathered.
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MinNumberOfMapAttemptsAfterWhichBatchWillBeCanceledIfRunningLowOnMemory}
+
+EXPERT ONLY:  
+Set minimum number of map attempts after which the batch will be canceled if running low on memory.
+
+- **Type**: `int`
+- **Default**: `512`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.MinimumTotalSizeOfJournalsToRunFlushAndSyncWhenReplacingSideBySideIndexInMb}
+
+Minimum total size of journals to run flush and sync when replacing side by side index in megabytes.
+
+- **Type**: `int`
+- **Default**: `512`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.NumberOfConcurrentStoppedBatchesIfRunningLowOnMemory}
+
+EXPERT ONLY:  
+Number of concurrent stopped batches if running low on memory.
+
+- **Type**: `int`
+- **Default**: `2`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.OrderByScoreAutomaticallyWhenBoostingIsInvolved}
+
+Set whether query results will be automatically ordered by score when a boost factor is involved in the query.  
+(A boost factor may be [assigned inside an index definition](../../indexes/boosting) or can be [applied at query time](../../client-api/session/querying/text-search/boost-search-results)).
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.OrderByTicksAutomaticallyWhenDatesAreInvolved}
+
+Sort by ticks when field contains dates.  
+When sorting in descending order, null dates are returned at the end with this option enabled.
+
+- **Type**: `bool`
+- **Default**: `true`
+  {NOTE: }
+  **Note** that the default value for this configuration key has changed in version 6.0 from `false` to `true` 
+  {NOTE/}
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.QueryClauseCache.Disabled}
+
+EXPERT ONLY:
+
+* Disable the query clause cache for a server, database, or a single index.
+
+* The default value is set by the constructor of class `IndexingConfiguration`.  
+  It will be `true` if your core configuration key [Features.Availability](../../server/configuration/core-configuration#features.availability) is Not set to 'Experimental'.
+
+---
+
+- **Type**: `bool`
+- **Default**: `DefaultValueSetInConstructor`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.QueryClauseCache.RepeatedQueriesTimeFrameInSec}
+
+EXPERT ONLY:  
+Queries that repeat within this time frame will be considered worth caching.
+
+- **Type**: `int`
+- **Default**: `300`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.ScratchSpaceLimitInMb}
+
+* Amount of scratch space in megabytes that we allow to use for the index storage.
+
+* After exceeding this limit the current indexing batch will complete and the index will force flush and sync storage environment.
+
+---
+
+- **Type**: `int`
+- **Default**: `null` (no limit)
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Static.SearchEngineType}
+
+Set the search engine to be used with static indexes.
+
+- **Type**: `enum SearchEngineType` (`Lucene`, `Corax`)
+- **Default**: `Lucene`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.Throttling.TimeIntervalInMs}
+
+How long the index should delay processing after new work is detected in milliseconds.
+
+- **Type**: `int`
+- **Default**: `null`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.TimeSinceLastQueryAfterWhichDeepCleanupCanBeExecutedInMin}
+
+Set how many minutes to wait before deep cleaning an idle index.  
+Deep cleanup reduces the cost of idle indexes.  
+It might slow the first query after the deep cleanup, thereafter queries return to normal performance.
+
+- **Type**: `int`
+- **Default**: `10`
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
+
+{PANEL: Indexing.TransactionSizeLimitInMb}
+
+Transaction size limit in megabytes after which an index will stop and complete the current batch.
+
+- **Type**: `int`
+- **Default**: `null` (no limit)
+- **Scope**: Server-wide, or per database, or per index
+
+{PANEL/}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/HowToSubscribeToOperationChanges.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/HowToSubscribeToOperationChanges.cs
new file mode 100644
index 0000000000..5159d47217
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/HowToSubscribeToOperationChanges.cs
@@ -0,0 +1,69 @@
+using System;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Changes;
+using Raven.Client.Documents.Operations;
+
+namespace Raven.Documentation.Samples.ClientApi.Changes
+{
+    public class HowToSubscribeToOperationChanges1
+    {
+        private interface IFoo
+        {
+            #region operation_changes_1
+            IChangesObservable<OperationStatusChange> ForOperationId(long operationId);
+            #endregion
+
+            #region operation_changes_3
+            IChangesObservable<OperationStatusChange> ForAllOperations();
+            #endregion
+        }
+
+        public HowToSubscribeToOperationChanges1()
+        {
+            using (var store = new DocumentStore())
+            {
+                var dbName = "sampleDB";
+                var nodeTag = "A";
+                var operationId = 7;
+                #region operation_changes_2
+                IDisposable subscription = store
+                    .Changes(dbName, nodeTag)
+                    .ForOperationId(operationId)
+                    .Subscribe(
+                        change =>
+                        {
+                            switch (change.State.Status)
+                            {
+                                case OperationStatus.InProgress:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Completed:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Faulted:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Canceled:
+                                    //Do Something
+                                    break;
+                                default:
+                                    throw new ArgumentOutOfRangeException();
+                            }
+                        });
+                #endregion
+            }
+
+            using (var store = new DocumentStore())
+            {
+                var dbName = "sampleDB";
+                var nodeTag = "A";
+                #region operation_changes_4
+                IDisposable subscription = store
+                    .Changes(dbName, nodeTag)
+                    .ForAllOperations()
+                    .Subscribe(change => Console.WriteLine("Operation #{1} reports progress: {0}", change.State.Progress.ToJson(), change.OperationId));
+                #endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/IConnectableChanges.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/IConnectableChanges.cs
new file mode 100644
index 0000000000..7eca57f087
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/IConnectableChanges.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Raven.Client.Documents.Changes;
+
+namespace Raven.Documentation.Samples.ClientApi.Changes
+{
+    #region connectable_changes
+    public interface IConnectableChanges<TChanges> : IDisposable
+        where TChanges : IDatabaseChanges
+    {
+        // returns state of the connection
+        bool Connected { get; }
+
+        // A task that ensures that the connection to the server was established.
+        Task<TChanges> EnsureConnectedNow();
+
+        //An event handler to detect changed to the connection status
+        event EventHandler ConnectionStatusChanged;
+
+        //An action to take if an error occured in the connection to the server
+        event Action<Exception> OnError;
+    }
+    #endregion
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/WhatIsChangesApi.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/WhatIsChangesApi.cs
new file mode 100644
index 0000000000..e63a7a7dc4
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Changes/WhatIsChangesApi.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading.Tasks;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Changes;
+
+
+namespace Raven.Documentation.Samples.ClientApi.Changes
+{
+    public class WhatIsChangesApi
+    {
+        private interface IFoo
+        {
+            #region changes_1
+            IDatabaseChanges Changes(string database = null);
+            #endregion
+
+            #region changes_ISingleNodeDatabaseChanges
+            ISingleNodeDatabaseChanges Changes(string database, string nodeTag);
+            #endregion
+        }
+
+        public async Task AsyncWhatIsChangesApi()
+        {
+            using (var store = new DocumentStore())
+            {
+                #region changes_2
+                IDatabaseChanges changes = store.Changes();
+                await changes.EnsureConnectedNow();
+                var subscription = changes
+                        .ForAllDocuments()
+                        .Subscribe(change => Console.WriteLine("{0} on document {1}", change.Type, change.Id));
+                try
+                {
+                    // application code here
+                }
+                finally
+                {
+                    if (subscription != null)
+                        subscription.Dispose();
+                }
+                #endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/CompareExchange/CompareExchange.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/CompareExchange/CompareExchange.cs
new file mode 100644
index 0000000000..145005ab93
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/CompareExchange/CompareExchange.cs
@@ -0,0 +1,365 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Raven.Client;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Indexes;
+using Raven.Client.Documents.Operations;
+using Raven.Client.Documents.Operations.CompareExchange;
+using Raven.Client.Documents.Operations.Configuration;
+using Raven.Client.Documents.Queries;
+using Raven.Client.Documents.Session;
+using Raven.Client.Http;
+using Raven.Client.Json;
+using Raven.Client.ServerWide;
+
+namespace Raven.Documentation.Samples.ClientApi.Operations
+{
+    public class CompareExchange
+    {
+        private interface IFoo
+        {
+            /*
+            #region get_0
+            public GetCompareExchangeValueOperation(string key)
+            #endregion
+
+            #region get_list_0
+            public GetCompareExchangeValuesOperation(string[] keys)
+            #endregion
+
+            #region get_list_1
+            public GetCompareExchangeValuesOperation(string startWith, int? start = null, int? pageSize = null)
+            #endregion
+
+            #region put_0
+            public PutCompareExchangeValueOperation(string key, T value, long index)
+            #endregion
+
+            #region delete_0
+            public DeleteCompareExchangeValueOperation(string key, long index)
+            #endregion
+            */
+        }
+        private class Foo
+        {
+            #region compare_exchange_value
+            public class CompareExchangeValue<T>
+            {
+                public readonly string Key;
+                public readonly T Value;
+                public readonly long Index;
+            }
+            #endregion
+
+            #region compare_exchange_result
+            public class CompareExchangeResult<T>
+            {
+                public bool Successful;
+                public T Value;
+                public long Index;
+            }
+            #endregion
+        }
+
+        public CompareExchange()
+        {
+            using (var store = new DocumentStore())
+            {
+                {
+                    #region get_1
+                    CompareExchangeValue<long> readResult =
+                        store.Operations.Send(new GetCompareExchangeValueOperation<long>("NextClientId"));
+
+                    long value = readResult.Value;
+                    #endregion
+                }
+
+                {
+                    #region get_2
+                    CompareExchangeValue<User> readResult =
+                        store.Operations.Send(new GetCompareExchangeValueOperation<User>("AdminUser"));
+
+                    User admin = readResult.Value;
+                    #endregion
+                }
+
+                {
+                    #region get_list_2
+                    Dictionary<string, CompareExchangeValue<string>> compareExchangeValues
+                        = store.Operations.Send(
+                            new GetCompareExchangeValuesOperation<string>(new[] { "Key-1", "Key-2" }));
+                    #endregion
+                }
+
+                {
+                    #region get_list_3
+                    // Get values for keys that have the common prefix 'users'
+                    // Retrieve maximum 20 entries
+                    Dictionary<string, CompareExchangeValue<User>> compareExchangeValues
+                        = store.Operations.Send(new GetCompareExchangeValuesOperation<User>("users", 0, 20));
+                    #endregion
+                }
+
+                {
+                    #region put_1 
+                    CompareExchangeResult<string> compareExchangeResult
+                        = store.Operations.Send(
+                            new PutCompareExchangeValueOperation<string>("Emails/foo@example.org", "users/123", 0));
+
+                    bool successful = compareExchangeResult.Successful;
+                    // If successfull is true: then Key 'foo@example.org' now has the value of "users/123"
+                    #endregion
+                }
+
+                {
+                    #region put_2
+                    // Get existing value
+                    CompareExchangeValue<User> readResult =
+                        store.Operations.Send(
+                            new GetCompareExchangeValueOperation<User>("AdminUser"));
+
+                    readResult.Value.Age++;
+
+                    // Update value
+                    CompareExchangeResult<User> saveResult
+                        = store.Operations.Send(
+                            new PutCompareExchangeValueOperation<User>("AdminUser", readResult.Value, readResult.Index));
+
+                    // The save result is successful only if 'index' wasn't changed between the read and write operations
+                    bool saveResultSuccessful = saveResult.Successful;
+                    #endregion
+                }
+
+                {
+                    #region put_3
+                    // Creating the item will fail because the index is not 0
+                    CompareExchangeResult<string> compareExchangeResult
+                        = store.Operations.Send(
+                            new PutCompareExchangeValueOperation<string>("key", "value", 123));
+
+                    // Creating the item will succeed because the index is 0
+                    compareExchangeResult = store.Operations.Send(
+                            new PutCompareExchangeValueOperation<string>("key", "value", 0));
+                    #endregion
+                }
+
+                {
+                    #region delete_1
+                    // First, get existing value
+                    CompareExchangeValue<User> readResult =
+                        store.Operations.Send(
+                            new GetCompareExchangeValueOperation<User>("AdminUser"));
+
+                    // Delete the key - use the index received from the 'Get' operation
+                    CompareExchangeResult<User> deleteResult
+                        = store.Operations.Send(
+                            new DeleteCompareExchangeValueOperation<User>("AdminUser", readResult.Index));
+
+                    // The delete result is successful only if the index has not changed between the read and delete operations
+                    bool deleteResultSuccessful = deleteResult.Successful;
+                    #endregion
+                }
+
+                #region expiration_0
+                using (IAsyncDocumentSession session = store.OpenAsyncSession())
+                {
+                    // Set a time exactly one week from now
+                    DateTime expirationTime = DateTime.UtcNow.AddDays(7);
+
+                    // Create a new compare exchange value
+                    var cmpxchgValue = session.Advanced.ClusterTransaction.CreateCompareExchangeValue("key", "value");
+
+                    // Edit Metadata
+                    cmpxchgValue.Metadata[Constants.Documents.Metadata.Expires] = expirationTime;
+
+                    // Send to server
+                    session.SaveChangesAsync();
+                }
+                #endregion
+
+                using (IAsyncDocumentSession session = store.OpenAsyncSession())
+                {
+                    #region expiration_1
+                    // Retrieve an existing key
+                    CompareExchangeValue<string> cmpxchgValue = store.Operations.Send(
+                            new GetCompareExchangeValueOperation<string>("key"));
+                
+                    // Set time
+                    DateTime expirationTime = DateTime.UtcNow.AddDays(7);
+                    
+                    // Edit Metadata
+                    cmpxchgValue.Metadata[Constants.Documents.Metadata.Expires] = expirationTime;
+                
+                    // Update value. Index must match the index on the server side,
+                    // or the operation will fail.
+                    CompareExchangeResult<string> result = store.Operations.Send(
+                            new PutCompareExchangeValueOperation<string>(
+                                cmpxchgValue.Key,
+                                cmpxchgValue.Value,
+                                cmpxchgValue.Index));
+                    #endregion
+                }
+
+                #region metadata_0
+                using (IAsyncDocumentSession session = store.OpenAsyncSession(
+                                                       new SessionOptions { 
+                                                           TransactionMode = TransactionMode.ClusterWide 
+                                                       }))
+                {
+                    // Create a new compare exchange value
+                    var cmpxchgValue = session.Advanced.ClusterTransaction.CreateCompareExchangeValue("key", "value");
+
+                    // Add a field to the metadata
+                    // with a value of type string
+                    cmpxchgValue.Metadata["Field name"] = "some value";
+
+                    // Retrieve metadata as a dictionary
+                    IDictionary<string, object> cmpxchgMetadata = cmpxchgValue.Metadata;
+                }
+                #endregion
+
+
+            }
+        }
+
+        public async Task AsyncExample()
+        {
+            using (var documentStore = new DocumentStore())
+            {
+                #region metadata_1
+                // Create some metadata
+                var cmpxchgMetadata = new MetadataAsDictionary {
+                                          ["Year"] = "2020" 
+                                      };
+
+                // Create/update the compare exchange value "best"
+                await documentStore.Operations.SendAsync(
+                    new PutCompareExchangeValueOperation<User>(
+                        "best", 
+                        new User { Name = "Alice" }, 
+                        0, 
+                        cmpxchgMetadata));
+                #endregion
+
+                // -Include examples-
+
+                #region include_load
+                using (IDocumentSession session = documentStore.OpenSession())
+                {
+                    // Load a user document, include the compare exchange value
+                    // with the key equal to the user's Name field
+                    var user = session.Load<User>("users/1-A", 
+                                                  includes => includes.IncludeCompareExchangeValue(
+                                                      x => x.Name));
+
+                    // Getting the compare exchange value does not require
+                    // another call to the server
+                    var value = session.Advanced.ClusterTransaction
+                                                .GetCompareExchangeValue<string>(user.Name);
+                }
+                #endregion
+
+                #region include_load_async
+                using (IAsyncDocumentSession session = documentStore.OpenAsyncSession())
+                {
+                    // Load a user document, include the compare exchange value
+                    // with the key equal to the user's Name field
+                    var user = await session.LoadAsync<User>("users/1-A", 
+                                                             includes => includes.IncludeCompareExchangeValue(
+                                                                 x => x.Name));
+
+                    // Getting the compare exchange value does not require
+                    // another call to the server
+                    var value = await session.Advanced.ClusterTransaction
+                                                      .GetCompareExchangeValueAsync<string>(user.Name);
+                }
+                #endregion
+
+                using (IDocumentSession session = documentStore.OpenSession())
+                {
+                    #region include_linq_query
+                    var users = session.Query<User>()
+                        .Include(builder => builder.IncludeCompareExchangeValue(x => x.Name))
+                        .ToList();
+
+                    List<CompareExchangeValue<string>> compareExchangeValues = null;
+
+                    // Getting the compare exchange values does not require
+                    // additional calls to the server
+                    foreach (User u in users){
+                        compareExchangeValues.Add(session.Advanced.ClusterTransaction
+                                                      .GetCompareExchangeValue<string>(u.Name));
+                    }
+                    #endregion
+                }
+
+                using (IDocumentSession session = documentStore.OpenSession())
+                {
+                    #region include_raw_query
+                    // First method: from body of query
+                    var users1 = session.Advanced
+                        .RawQuery<User>(@"
+                            from Users as u
+                            select u
+                            include cmpxchg(u.Name)"
+                        )
+                        .ToList();
+
+                    List<CompareExchangeValue<string>> compareExchangeValues1 = null;
+
+                    // Getting the compare exchange values does not require
+                    // additional calls to the server
+                    foreach (User u in users1){
+                        compareExchangeValues1.Add(session.Advanced.ClusterTransaction
+                                                   .GetCompareExchangeValue<string>(u.Name));
+                    }
+
+
+                    // Second method: from a JavaScript function
+                    var users2 = session.Advanced
+                        .RawQuery<User>(@"
+                            declare function includeCEV(user) {
+                                includes.cmpxchg(user.Name);
+                                return user;
+                            }
+
+                            from Users as u
+                            select includeCEV(u)"
+                        )
+                        .ToList();
+                    // Note that includeCEV() returns the same User 
+                    // entity it received, without modifying it
+
+                    List<CompareExchangeValue<string>> compareExchangeValues2 = null;
+
+                    // Does not require calls to the server
+                    foreach (User u in users2){
+                        compareExchangeValues2.Add(session.Advanced.ClusterTransaction
+                                                   .GetCompareExchangeValue<string>(u.Name));
+                    }
+                    #endregion
+                }
+            }
+        }
+
+        private class User
+        {
+            public string Name { get; set; }
+            public int Age { get; set; }
+        }
+
+        #region include_builder
+        public interface ICompareExchangeValueIncludeBuilder<T, out TBuilder>
+        {
+            TBuilder IncludeCompareExchangeValue(string path);
+
+            TBuilder IncludeCompareExchangeValue(Expression<Func<T, string>> path);
+
+            TBuilder IncludeCompareExchangeValue(Expression<Func<T, IEnumerable<string>>> path);
+        }
+        #endregion
+    }
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs
new file mode 100644
index 0000000000..96a4552b74
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/ClientApi/Operations/Counters/Counters.cs
@@ -0,0 +1,340 @@
+using System.Collections.Generic;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Operations.Counters;
+
+namespace Raven.Documentation.Samples.ClientApi.Operations
+{
+    public class Counters
+    {
+        private class GetCountersOperation
+        {
+            #region get_single_counter
+            public GetCountersOperation(string docId, string counter, bool returnFullResults = false)
+            #endregion
+            { }
+
+            #region get_multiple_counters
+            public GetCountersOperation(string docId, string[] counters, bool returnFullResults = false)
+            #endregion
+            { }
+
+            #region get_all_counters
+            public GetCountersOperation(string docId, bool returnFullResults = false)
+            #endregion
+            { }
+
+        }
+
+        #region counter_batch
+
+        public class CounterBatch
+        {
+            public bool ReplyWithAllNodesValues; // A flag that indicates if the results should include a
+                                                 // dictionary of counter values per database node
+            public List<DocumentCountersOperation> Documents = new List<DocumentCountersOperation>();
+        }
+
+        #endregion
+
+        private class CounterBatchOperation
+        {
+            #region counter_batch_op
+            public CounterBatchOperation(CounterBatch counterBatch)
+            #endregion
+            { }
+        }
+
+        #region document_counters_op
+
+        public class DocumentCountersOperation
+        {
+            public string DocumentId; // Id of the document that holds the counters
+            public List<CounterOperation> Operations; // A list of counter operations to perform
+        }
+
+        #endregion
+
+        #region counter_operation
+
+        public class CounterOperation
+        {
+            public CounterOperationType Type;
+            public string CounterName;
+            public long Delta; // the value to increment by
+        }
+
+        #endregion
+
+        #region counter_operation_type
+
+        public enum CounterOperationType
+        {
+            Increment,
+            Delete,
+            Get
+        }
+
+        #endregion
+
+        #region counters_detail
+        public class CountersDetail
+        {
+            public List<CounterDetail> Counters;
+        }
+        #endregion
+
+        #region counter_detail
+        public class CounterDetail
+        {
+            public string DocumentId; // ID of the document that holds the counter
+            public string CounterName; // The counter name
+            public long TotalValue; // Total counter value
+            public Dictionary<string, long> CounterValues; // A dictionary of counter values per database node
+            public long Etag; // Counter Etag
+            public string ChangeVector; // Change vector of the counter
+        }
+        #endregion
+    }
+
+    public class CountersExamples
+    {
+        public CountersExamples()
+        {
+            using (var store = new DocumentStore())
+            {
+                {
+                    #region get_counters1
+
+                    var operationResult = store.Operations
+                        .Send(new GetCountersOperation("users/1", "likes"));
+
+                    #endregion
+                }
+
+                {
+                    #region get_counters2
+
+                    var operationResult = store.Operations
+                        .Send(new GetCountersOperation("users/1", new []{"likes", "dislikes" }));
+
+                    #endregion
+                }
+
+                {
+                    #region get_counters3
+
+                    var operationResult = store.Operations
+                        .Send(new GetCountersOperation("users/1"));
+
+                    #endregion
+                }
+
+                {
+                    #region get_counters4
+
+                    var operationResult = store.Operations
+                        .Send(new GetCountersOperation("users/1", "likes", true));
+
+                    #endregion
+                }
+                {
+                    #region counter_batch_exmpl1
+
+                    var operationResult = store.Operations.Send(new CounterBatchOperation(new CounterBatch
+                    {
+                        Documents = new List<DocumentCountersOperation>
+                        {
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/1",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Increment,
+                                        CounterName = "likes",
+                                        Delta = 5
+                                    },
+                                    new CounterOperation
+                                    {
+                                        // No Delta specified, value will be incremented by 1
+                                        // (From RavenDB 6.1 on, the default Delta is 1)
+
+                                        Type = CounterOperationType.Increment,
+                                        CounterName = "dislikes"
+                                    }
+                                }
+                            },
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/2",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Increment,
+                                        CounterName = "likes",
+                                        Delta = 100
+                                    },
+                                    new CounterOperation
+                                    {
+                                        // this will create a new counter "score", with initial value 50
+                                        // "score" will be added to counter-names in "users/2" metadata
+
+                                        Type = CounterOperationType.Increment,
+                                        CounterName = "score", 
+                                        Delta = 50
+                                    }
+                                }
+                            }
+                        }
+                    }));
+                    #endregion
+                }
+                {
+                    #region counter_batch_exmpl2
+
+                    var operationResult = store.Operations.Send(new CounterBatchOperation(new CounterBatch
+                    {
+                        Documents = new List<DocumentCountersOperation>
+                        {
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/1",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "likes"
+                                    },
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "downloads"
+                                    }
+                                }
+                            },
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/2",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "likes"
+                                    },
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "score"
+                                    }
+                                }
+                            }
+                        }
+                    }));
+                    #endregion
+                }
+                {
+                    #region counter_batch_exmpl3
+
+                    var operationResult = store.Operations.Send(new CounterBatchOperation(new CounterBatch
+                    {
+                        Documents = new List<DocumentCountersOperation>
+                        {
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/1",
+                                Operations = new List<CounterOperation>
+                                {
+                                    // "likes" and "dislikes" will be removed from counter-names in "users/1" metadata
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Delete,
+                                        CounterName = "likes"
+                                    },
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Delete,
+                                        CounterName = "dislikes"
+                                    }
+                                }
+                            },
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/2",
+                                Operations = new List<CounterOperation>
+                                {
+                                    // "downloads" will be removed from counter-names in "users/2" metadata
+
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Delete,
+                                        CounterName = "downloads"
+                                    }
+                                }
+                            }
+                        }
+                    }));
+                    #endregion
+                }
+
+                {
+                    #region counter_batch_exmpl4
+
+                    var operationResult = store.Operations.Send(new CounterBatchOperation(new CounterBatch
+                    {
+                        Documents = new List<DocumentCountersOperation>
+                        {
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/1",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Increment,
+                                        CounterName = "likes",
+                                        Delta = 30
+                                    },
+                                    new CounterOperation
+                                    {
+                                        // The results will include null for this 'Get'
+                                        // since we deleted the "dislikes" counter in the previous example flow
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "dislikes"
+                                    },
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Delete,
+                                        CounterName = "downloads"
+                                    }
+                                }
+                            },
+                            new DocumentCountersOperation
+                            {
+                                DocumentId = "users/2",
+                                Operations = new List<CounterOperation>
+                                {
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Get,
+                                        CounterName = "likes"
+                                    },
+                                    new CounterOperation
+                                    {
+                                        Type = CounterOperationType.Delete,
+                                        CounterName = "dislikes"
+                                    }
+                                }
+                            }
+                        }
+                    }));
+                    #endregion
+                }
+            }
+        }
+    }
+
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Indexes/SearchEngines.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Indexes/SearchEngines.cs
new file mode 100644
index 0000000000..3979c2f719
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Indexes/SearchEngines.cs
@@ -0,0 +1,120 @@
+using System;
+using System.IO;
+using System.Linq;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Indexes;
+using Raven.Client.Documents.Operations.Indexes;
+
+namespace Raven.Documentation.Samples.SearchEngine
+{
+    public class SearchEngine
+    {
+        private class Product
+        {
+            public Product(string name, string brand)
+            {
+                Name = name;
+                Brand = brand;
+            }
+
+            public string Id { get; set; }
+            public string Name { get; set; }
+            public string Brand { get; set; }
+        }
+
+        #region index-definition_set-search-engine-type
+        private class Product_ByAvailability : AbstractIndexCreationTask<Product>
+        {
+            public Product_ByAvailability(SearchEngineType type)
+            {
+                // Any Map/Reduce segments here
+                Map = products => from p in products
+                                  select new
+                                  {
+                                      p.Name,
+                                      p.Brand
+                                  };
+
+                // The preferred search engine type
+                SearchEngineType = type;
+            }
+        }
+        #endregion
+
+        public void indexAvailableProducts()
+        {
+            var productId = "Products/1-A";
+
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    session.Store(new Product("prodName", "prodBrand"), productId);
+                    session.SaveChanges();
+                }
+
+                #region index-definition_select-while-creating-index
+                // Set search engine type while creating the index
+                new Product_ByAvailability(SearchEngineType.Corax).Execute(store);
+                #endregion
+            }
+        }
+
+        public void indexOrderByLocation()
+        {
+            using (var store = new DocumentStore())
+            {
+
+                new Order_ByLocation(SearchEngineType.Corax).Execute(store);
+            }
+        }
+
+        #region index-definition_disable-indexing-for-specified-field
+        private class Order_ByLocation : AbstractIndexCreationTask<Order>
+        {
+            public Order_ByLocation(SearchEngineType type)
+            {
+                Map = orders => from o in orders
+                                select new
+                                {
+                                    o.ShipTo.Location
+                                };
+
+                SearchEngineType = type;
+
+                // Disable indexing for this field
+                Index("Location", FieldIndexing.No);
+
+                // Store the field's content
+                // (this is mandatory if the field's indexing is disabled)
+                Store("Location", FieldStorage.Yes);
+            }
+        }
+        #endregion
+
+        public class Order
+        {
+            public string Id { get; set; }
+            public string Company { get; set; }
+            public string Employee { get; set; }
+            public DateTime OrderedAt { get; set; }
+            public DateTime RequireAt { get; set; }
+            public DateTime? ShippedAt { get; set; }
+            public Address ShipTo { get; set; }
+            public string ShipVia { get; set; }
+            public decimal Freight { get; set; }
+        }
+
+        public class Address
+        {
+            public string Id { get; set; }
+            public string Country { get; set; }
+            public string City { get; set; }
+            public string Street { get; set; }
+            public int ZipCode { get; set; }
+            public object Location { get; internal set; }
+        }
+
+
+    }
+}
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Raven.Documentation.Samples.csproj b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Raven.Documentation.Samples.csproj
index 95b9066855..7901f90cea 100644
--- a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Raven.Documentation.Samples.csproj
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/Raven.Documentation.Samples.csproj
@@ -7,9 +7,9 @@
   <ItemGroup>
     <PackageReference Include="AWSXRayRecorder.Handlers.System.Net" Version="2.11.0" />
     <PackageReference Include="NodaTime" Version="3.1.10" />
-    <PackageReference Include="RavenDB.Client" Version="6.1.0-nightly-20240709-0737" />
-    <PackageReference Include="RavenDB.Embedded" Version="6.1.0-nightly-20240709-0737" />
-    <PackageReference Include="RavenDB.TestDriver" Version="6.1.0-nightly-20240709-0737" />
+    <PackageReference Include="RavenDB.Client" Version="6.1.0-nightly-20240818-0201" />
+    <PackageReference Include="RavenDB.Embedded" Version="6.1.0-nightly-20240818-0201" />
+    <PackageReference Include="RavenDB.TestDriver" Version="6.1.0-nightly-20240818-0201" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Reactive.Core" Version="6.0.0" />
     <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
diff --git a/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/migration/BreakingChanges.cs b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/migration/BreakingChanges.cs
new file mode 100644
index 0000000000..0de9e881f0
--- /dev/null
+++ b/Documentation/6.1/Samples/csharp/Raven.Documentation.Samples/migration/BreakingChanges.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Changes;
+using Raven.Client.Documents.Operations;
+using Raven.Client.Documents.Operations.CompareExchange;
+using Raven.Client.Documents.Operations.Counters;
+
+namespace Raven.Documentation.Samples.ClientApi.Changes
+{
+    public class HowToSubscribeToOperationChanges
+    {
+        // Changes overload that allows subscribing to operations changes
+        private interface IFoo
+        {
+            #region changes-definition
+            ISingleNodeDatabaseChanges Changes(string database, string nodeTag);
+            #endregion
+        }
+
+        public HowToSubscribeToOperationChanges()
+        {
+            // Subscribing operations with Changes requires opening Changes with DB name AND node Tag
+            using (var store = new DocumentStore())
+            {
+                var operationId = 1;
+                string database = "database";
+                string nodeTag = "node";
+                #region changes_ForOperationId
+                IDisposable subscription = store
+                    .Changes(database, nodeTag)
+                    .ForOperationId(operationId)
+                    .Subscribe(
+                        change =>
+                        {
+                            switch (change.State.Status)
+                            {
+                                case OperationStatus.InProgress:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Completed:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Faulted:
+                                    //Do Something
+                                    break;
+                                case OperationStatus.Canceled:
+                                    //Do Something
+                                    break;
+                                default:
+                                    throw new ArgumentOutOfRangeException();
+                            }
+                        });
+                #endregion
+            };
+
+            // CounterBatchOperation that is not passed a Delta increments counters by 1
+            using (var store = new DocumentStore())
+            {
+                #region CounterBatchOperation
+                var operationResult = store.Operations.Send(new CounterBatchOperation(new CounterBatch
+                {
+                    Documents = new List<DocumentCountersOperation>
+                    {
+                        new DocumentCountersOperation
+                        {
+                            DocumentId = "users/1",
+                            Operations = new List<CounterOperation>
+                            {
+                                new CounterOperation
+                                {
+                                    Type = CounterOperationType.Increment,
+                                    CounterName = "likes",
+                                    Delta = 5
+                                },
+                                new CounterOperation
+                                {
+                                    // No delta specified, value will be incremented by 1
+                                    Type = CounterOperationType.Increment,
+                                    CounterName = "dislikes"
+                                }
+                            }
+                        }
+                    }
+                }));
+                #endregion
+            }
+
+            // Compare exchange can be created only with index set to 0
+            using (var store = new DocumentStore())
+            {
+                #region CmpXchg
+                // Creating the item will fail because the index is not 0
+                CompareExchangeResult<string> compareExchangeResult
+                    = store.Operations.Send(
+                        new PutCompareExchangeValueOperation<string>("key", "value", 123));
+
+                // Creating the item will succeed because the index is 0
+                compareExchangeResult = store.Operations.Send(
+                        new PutCompareExchangeValueOperation<string>("key", "value", 0));
+                #endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/HowToSubscribeToOperationChanges.java b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/HowToSubscribeToOperationChanges.java
new file mode 100644
index 0000000000..c290c5c35a
--- /dev/null
+++ b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/HowToSubscribeToOperationChanges.java
@@ -0,0 +1,50 @@
+package net.ravendb.ClientApi.changes;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.changes.IChangesObservable;
+import net.ravendb.client.documents.changes.Observers;
+import net.ravendb.client.documents.changes.OperationStatusChange;
+import net.ravendb.client.primitives.CleanCloseable;
+
+public class HowToSubscribeToOperationChanges {
+
+    private interface IFoo {
+        //region operation_changes_1
+        IChangesObservable<OperationStatusChange> forOperationId(long operationId);
+        //endregion
+
+        //region operation_changes_3
+        IChangesObservable<OperationStatusChange> forAllOperations();
+        //endregion
+    }
+
+    public HowToSubscribeToOperationChanges() {
+        long operationId = 7;
+        try (IDocumentStore store = new DocumentStore()) {
+            //region operation_changes_2
+            CleanCloseable subscription = store
+                .changes()
+                .forOperationId(operationId)
+                .subscribe(Observers.create(change -> {
+                    ObjectNode operationState = change.getState();
+
+                    // do something
+                }));
+            //endregion
+        }
+
+        try (IDocumentStore store = new DocumentStore()) {
+            //region operation_changes_4
+            CleanCloseable subscription = store
+                .changes()
+                .forAllOperations()
+                .subscribe(Observers.create(change -> {
+                    System.out.println("Operation #" + change.getOperationId());
+                }));
+            //endregion
+        }
+
+    }
+}
diff --git a/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/IConnectableChanges.java b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/IConnectableChanges.java
new file mode 100644
index 0000000000..a520401e95
--- /dev/null
+++ b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/IConnectableChanges.java
@@ -0,0 +1,26 @@
+package net.ravendb.ClientApi.Changes;
+
+import net.ravendb.client.documents.changes.IDatabaseChanges;
+import net.ravendb.client.primitives.CleanCloseable;
+import net.ravendb.client.primitives.EventHandler;
+import net.ravendb.client.primitives.VoidArgs;
+
+import java.util.function.Consumer;
+
+//region connectable_changes
+public interface IConnectableChanges<TChanges extends IDatabaseChanges> extends CleanCloseable {
+
+    boolean isConnected();
+
+    void ensureConnectedNow();
+
+    void addConnectionStatusChanged(EventHandler<VoidArgs> handler);
+
+    void removeConnectionStatusChanged(EventHandler<VoidArgs> handler);
+
+    void addOnError(Consumer<Exception> handler);
+
+    void removeOnError(Consumer<Exception> handler);
+}
+//endregion
+
diff --git a/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/WhatIsChangesApi.java b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/WhatIsChangesApi.java
new file mode 100644
index 0000000000..709dd23163
--- /dev/null
+++ b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Changes/WhatIsChangesApi.java
@@ -0,0 +1,39 @@
+package net.ravendb.ClientApi.Changes;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.changes.IDatabaseChanges;
+import net.ravendb.client.documents.changes.Observers;
+
+public class WhatIsChangesApi {
+
+    private interface IFoo {
+        //region changes_1
+        IDatabaseChanges changes();
+
+        IDatabaseChanges changes(String database);
+        //endregion
+    }
+
+    public WhatIsChangesApi() {
+        try (IDocumentStore store = new DocumentStore()) {
+            //region changes_2
+            IDatabaseChanges subscription = store.changes();
+
+            subscription.ensureConnectedNow();
+
+            subscription.forAllDocuments().subscribe(Observers.create(change -> {
+                System.out.println(change.getType() + " on document " + change.getId());
+            }));
+
+            try {
+                // application code here
+            } finally {
+                if (subscription != null) {
+                    subscription.close();
+                }
+            }
+            //endregion
+        }
+    }
+}
diff --git a/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/CompareExchange/CompareExchange.java b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/CompareExchange/CompareExchange.java
new file mode 100644
index 0000000000..e4aa6d7dda
--- /dev/null
+++ b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/CompareExchange/CompareExchange.java
@@ -0,0 +1,209 @@
+package net.ravendb.ClientApi.Operations;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.operations.compareExchange.*;
+
+import java.util.Map;
+
+public class CompareExchange {
+
+    private interface IFoo<T> {
+        /*
+        //region get_0
+        GetCompareExchangeValueOperation(Class<T> clazz, String key);
+        //endregion
+
+        //region get_list_0
+        GetCompareExchangeValuesOperation(Class<T> clazz, String[] keys);
+        //endregion
+
+        //region get_list_1
+        GetCompareExchangeValuesOperation(Class<T> clazz, String startWith)
+        GetCompareExchangeValuesOperation(Class<T> clazz, String startWith, Integer start)
+        GetCompareExchangeValuesOperation(Class<T> clazz, String startWith, Integer start, Integer pageSize)
+        //endregion
+
+        //region put_0
+        public PutCompareExchangeValueOperation(String key, T value, long index)
+        //endregion
+
+        //region delete_0
+        public DeleteCompareExchangeValueOperation(Class<T> clazz, String key, long index)
+        //endregion
+        */
+    }
+
+    private static class Foo {
+        //region compare_exchange_value
+        public class CompareExchangeValue<T> {
+            private String key;
+            private long index;
+            private T value;
+
+            public CompareExchangeValue(String key, long index, T value) {
+                this.key = key;
+                this.index = index;
+                this.value = value;
+            }
+
+            public String getKey() {
+                return key;
+            }
+
+            public void setKey(String key) {
+                this.key = key;
+            }
+
+            public long getIndex() {
+                return index;
+            }
+
+            public void setIndex(long index) {
+                this.index = index;
+            }
+
+            public T getValue() {
+                return value;
+            }
+
+            public void setValue(T value) {
+                this.value = value;
+            }
+        }
+        //endregion
+
+        //region compare_exchange_result
+        public class CompareExchangeResult<T> {
+            private T value;
+            private long index;
+            private boolean successful;
+
+            public T getValue() {
+                return value;
+            }
+
+            public void setValue(T value) {
+                this.value = value;
+            }
+
+            public long getIndex() {
+                return index;
+            }
+
+            public void setIndex(long index) {
+                this.index = index;
+            }
+
+            public boolean isSuccessful() {
+                return successful;
+            }
+
+            public void setSuccessful(boolean successful) {
+                this.successful = successful;
+            }
+        }
+        //endregion
+    }
+
+    private static class User {
+        private int age;
+
+        public int getAge() {
+            return age;
+        }
+
+        public void setAge(int age) {
+            this.age = age;
+        }
+    }
+
+    public CompareExchange() {
+        try (IDocumentStore store = new DocumentStore()) {
+            {
+                //region get_1
+                CompareExchangeValue<Long> readResult
+                    = store.operations().send(new GetCompareExchangeValueOperation<>(Long.class, "nextClientId"));
+
+                Long value = readResult.getValue();
+                //endregion
+            }
+
+            {
+                //region get_2
+                CompareExchangeValue<User> readResult
+                    = store.operations().send(
+                        new GetCompareExchangeValueOperation<>(User.class, "AdminUser"));
+
+                User admin = readResult.getValue();
+                //endregion
+            }
+
+            {
+                //region get_list_2
+                Map<String, CompareExchangeValue<String>> compareExchangeValues
+                    = store.operations().send(
+                        new GetCompareExchangeValuesOperation<>(String.class, new String[]{"Key-1", "Key-2"}));
+                //endregion
+            }
+
+            {
+                //region get_list_3
+                // Get values for keys that have the common prefix 'users'
+                // Retrieve maximum 20 entries
+                Map<String, CompareExchangeValue<User>> compareExchangeValues
+                    = store.operations().send(
+                        new GetCompareExchangeValuesOperation<>(User.class, "users", 0, 20));
+
+                //endregion
+            }
+
+            {
+                //region put_1
+                CompareExchangeResult<String> compareExchangeResult = store.operations().send(
+                    new PutCompareExchangeValueOperation<>("Emails/foo@example.org", "users/123", 0));
+
+                boolean successful = compareExchangeResult.isSuccessful();
+                // If successful is true: then Key 'foo@example.org' now has the value of "users/123"
+                //endregion
+            }
+
+            {
+                //region put_2
+                // Get existing value
+                CompareExchangeValue<User> readResult
+                    = store.operations().send(
+                        new GetCompareExchangeValueOperation<>(User.class, "AdminUser"));
+
+                readResult.getValue().setAge(readResult.getValue().getAge() + 1);
+
+                // Update value
+                CompareExchangeResult<User> saveResult
+                    = store.operations().send(
+                        new PutCompareExchangeValueOperation<>("AdminUser", readResult.getValue(), readResult.getIndex()));
+
+                // The save result is successful only if 'index' wasn't changed between the read and write operations
+                boolean saveResultSuccessful = saveResult.isSuccessful();
+                //endregion
+            }
+
+            {
+                //region delete_1
+                // First, get existing value
+                CompareExchangeValue<User> readResult
+                    = store.operations().send(
+                        new GetCompareExchangeValueOperation<>(User.class, "AdminUser"));
+
+                // Delete the key - use the index received from the 'Get' operation
+                CompareExchangeResult<User> deleteResult
+                    = store.operations().send(
+                        new DeleteCompareExchangeValueOperation<>(User.class, "AdminUser", readResult.getIndex()));
+
+                // The delete result is successful only if the index has not changed between the read and delete operations
+                boolean deleteResultSuccessful = deleteResult.isSuccessful();
+                //endregion
+            }
+        }
+    }
+
+}
diff --git a/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/Counters/Counters.java b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/Counters/Counters.java
new file mode 100644
index 0000000000..bcea7b6d8b
--- /dev/null
+++ b/Documentation/6.1/Samples/java/src/test/java/net/ravendb/ClientApi/Operations/Counters/Counters.java
@@ -0,0 +1,236 @@
+package net.ravendb.ClientApi.Operations;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.operations.counters.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class Counters {
+
+    private static class Definitions {
+        private class GetCountersOperation {
+        /*
+        //region get_single_counter
+        public GetCountersOperation(String docId, String counter)
+        public GetCountersOperation(String docId, String counter, boolean returnFullResults)
+        //endregion
+        */
+
+        /*
+        //region get_multiple_counters
+        public GetCountersOperation(String docId, String[] counters)
+        public GetCountersOperation(String docId, String[] counters, boolean returnFullResults)
+        //endregion
+        */
+
+        /*
+        //region get_all_counters
+        public GetCountersOperation(String docId)
+        public GetCountersOperation(String docId, boolean returnFullResults)
+        //endregion
+         */
+        }
+
+        //region counter_batch
+        public class CounterBatch {
+            private boolean replyWithAllNodesValues;
+            private List<DocumentCountersOperation> documents = new ArrayList<>();
+
+            // getters and setters
+        }
+        //endregion
+
+        private class CounterBatchOperation {
+            //region counter_batch_op
+            public CounterBatchOperation(CounterBatch counterBatch)
+            //endregion
+            {}
+        }
+
+        //region document_counters_op
+        public class DocumentCountersOperation {
+            private List<CounterOperation> operations;
+            private String documentId;
+
+            // getters and setters
+        }
+        //endregion
+
+        //region counter_operation
+        public static class CounterOperation {
+            private CounterOperationType type;
+            private String counterName;
+            private long delta; // the value to increment by
+
+            // getters and setters
+        }
+        //endregion
+
+        //region counter_operation_type
+        public enum CounterOperationType {
+            NONE,
+            INCREMENT,
+            DELETE,
+            GET,
+            PUT
+        }
+        //endregion
+
+        //region counters_detail
+        public class CountersDetail {
+
+            private List<CounterDetail> counters;
+
+            // getters and setters
+        }
+        //endregion
+
+        //region counter_detail
+        public class CounterDetail {
+            private String documentId; // ID of the document that holds the counter
+            private String counterName; // The counter name
+            private long totalValue; // Total counter value
+            private long etag; // Counter Etag
+            private Map<String, Long> counterValues; // A map of counter values per database node
+
+            private String changeVector; // Change vector of the counter
+
+            // getters and setters
+        }
+        //endregion
+    }
+
+    public class CountersExamples {
+        public CountersExamples() {
+            try (IDocumentStore store = new DocumentStore()) {
+                {
+                    //region get_counters1
+                    CountersDetail operationResult = store.operations()
+                        .send(new GetCountersOperation("users/1", "likes"));
+                    //endregion
+                }
+
+                {
+                    //region get_counters2
+                    CountersDetail operationResult = store.operations()
+                        .send(new GetCountersOperation("users/1", new String[]{ "likes", "dislikes" }));
+                    //endregion
+                }
+
+                {
+                    //region get_counters3
+                    CountersDetail operationResult = store.operations()
+                        .send(new GetCountersOperation("users/1"));
+                    //endregion
+                }
+
+                {
+                    //region get_counters4
+                    CountersDetail operationResult = store.operations()
+                        .send(new GetCountersOperation("users/1", "likes", true));
+                    //endregion
+                }
+
+                {
+                    //region counter_batch_exmpl1
+                    DocumentCountersOperation operation1 = new DocumentCountersOperation();
+                    operation1.setDocumentId("users/1");
+                    operation1.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.INCREMENT, 5),
+                        CounterOperation.create("dislikes", CounterOperationType.INCREMENT) // No delta specified, value will stay the same
+                    ));
+
+                    DocumentCountersOperation operation2 = new DocumentCountersOperation();
+                    operation2.setDocumentId("users/2");
+                    operation2.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.INCREMENT, 100),
+
+                        // this will create a new counter "score", with initial value 50
+                        // "score" will be added to counter-names in "users/2" metadata
+                        CounterOperation.create("score", CounterOperationType.INCREMENT, 50)
+                    ));
+
+                    CounterBatch counterBatch = new CounterBatch();
+                    counterBatch.setDocuments(Arrays.asList(operation1, operation2));
+                    store.operations().send(new CounterBatchOperation(counterBatch));
+                    //endregion
+                }
+
+                {
+                    //region counter_batch_exmpl2
+                    DocumentCountersOperation operation1 = new DocumentCountersOperation();
+                    operation1.setDocumentId("users/1");
+                    operation1.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.GET),
+                        CounterOperation.create("downloads", CounterOperationType.GET)
+                    ));
+
+                    DocumentCountersOperation operation2 = new DocumentCountersOperation();
+                    operation2.setDocumentId("users/2");
+                    operation2.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.GET),
+                        CounterOperation.create("score", CounterOperationType.GET)
+                    ));
+
+                    CounterBatch counterBatch = new CounterBatch();
+                    counterBatch.setDocuments(Arrays.asList(operation1, operation2));
+
+                    store.operations().send(new CounterBatchOperation(counterBatch));
+                    //endregion
+                }
+
+                {
+                    //region counter_batch_exmpl3
+                    DocumentCountersOperation operation1 = new DocumentCountersOperation();
+                    operation1.setDocumentId("users/1");
+                    operation1.setOperations(Arrays.asList(
+                        // "likes" and "dislikes" will be removed from counter-names in "users/1" metadata
+                        CounterOperation.create("likes", CounterOperationType.DELETE),
+                        CounterOperation.create("dislikes", CounterOperationType.DELETE)
+                    ));
+
+                    DocumentCountersOperation operation2 = new DocumentCountersOperation();
+                    operation2.setDocumentId("users/2");
+                    operation2.setOperations(Arrays.asList(
+                        // "downloads" will be removed from counter-names in "users/2" metadata
+                        CounterOperation.create("downloads", CounterOperationType.DELETE)
+                    ));
+
+                    CounterBatch counterBatch = new CounterBatch();
+                    counterBatch.setDocuments(Arrays.asList(operation1, operation2));
+                    store.operations().send(new CounterBatchOperation(counterBatch));
+                    //endregion
+                }
+
+                {
+                    //region counter_batch_exmpl4
+                    DocumentCountersOperation operation1 = new DocumentCountersOperation();
+                    operation1.setDocumentId("users/1");
+                    operation1.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.INCREMENT, 30),
+                        // The results will include null for this 'Get' 
+                        // since we deleted the "dislikes" counter in the previous example flow
+                        CounterOperation.create("dislikes", CounterOperationType.GET),
+                        CounterOperation.create("downloads", CounterOperationType.DELETE)
+                    ));
+
+                    DocumentCountersOperation operation2 = new DocumentCountersOperation();
+                    operation2.setDocumentId("users/2");
+                    operation2.setOperations(Arrays.asList(
+                        CounterOperation.create("likes", CounterOperationType.GET),
+                        CounterOperation.create("dislikes", CounterOperationType.DELETE)
+                    ));
+
+                    CounterBatch counterBatch = new CounterBatch();
+                    counterBatch.setDocuments(Arrays.asList(operation1, operation2));
+                    store.operations().send(new CounterBatchOperation(counterBatch));
+                    //endregion
+                }
+            }
+        }
+    }
+}
diff --git a/Documentation/6.1/Samples/nodejs/client-api/changes/howToSubscribeToOperationChanges.js b/Documentation/6.1/Samples/nodejs/client-api/changes/howToSubscribeToOperationChanges.js
new file mode 100644
index 0000000000..2f1d11ce57
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/changes/howToSubscribeToOperationChanges.js
@@ -0,0 +1,39 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+const session = store.openSession();
+
+const operationId = 7;
+
+{
+    //region operation_changes_1
+    store.changes().forOperationId(operationId);
+    //endregion
+
+    //region operation_changes_3
+    store.changes().forAllOperations();
+    //endregion
+}
+
+{
+    {
+        //region operation_changes_2
+        store.changes().forOperationId(operationId)
+            .on("data", change => {
+                const operationState = change.state;
+
+                // do something
+            });
+        //endregion
+    }
+
+    {
+        //region operation_changes_4
+        store.changes().forAllOperations()
+            .on("data", change => {
+                console.log("Operation #" + change.operationId);
+            });
+        //endregion
+    }
+
+}
diff --git a/Documentation/6.1/Samples/nodejs/client-api/changes/whatIsChangesApi.js b/Documentation/6.1/Samples/nodejs/client-api/changes/whatIsChangesApi.js
new file mode 100644
index 0000000000..a0117cd23a
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/changes/whatIsChangesApi.js
@@ -0,0 +1,40 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+const session = store.openSession();
+
+{
+    let database;
+    //region changes_1
+    store.changes([database]);
+    //endregion
+}
+
+async function example() {
+    {
+        //region changes_2
+        const changes = store.changes();
+
+        await changes.ensureConnectedNow();
+
+        const allDocsChanges = changes.forAllDocuments()
+            .on("data", change => {
+                console.log(change.type + " on document " + change.id);
+            })
+            .on("error", err => {
+                // handle error
+            });
+
+        // ...
+
+        try {
+            // application code here
+        } finally {
+            // dispose changes after use
+            if (changes != null) {
+                changes.dispose();
+            }
+        }
+        //endregion
+    }
+}
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/deleteCompareExchange.js b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/deleteCompareExchange.js
new file mode 100644
index 0000000000..515bc8052f
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/deleteCompareExchange.js
@@ -0,0 +1,51 @@
+import { DocumentStore } from "ravendb";
+import assert from "assert";
+
+const documentStore = new DocumentStore();
+
+async function deleteCompareExchange() {
+    {
+        //region delete_1
+        // Get an existing compare-exchange item
+        const getCmpXchgOp = new GetCompareExchangeValueOperation("johnDoe@gmail.com");
+        const itemResult = await documentStore.operations.send(getCmpXchgOp);
+        
+        // Keep the item's version
+        const versionOfItem = itemResult.index; 
+
+        // Delete the compare-exchange item:
+        // =================================
+
+        // Define the delete compare-exchange operation, pass:
+        // * The item's KEY
+        // * The item's INDEX (its version)
+        //   The compare-exchange item will only be deleted if this number 
+        //   is equal to the one stored on the server when the delete operation is executed.
+        const deleteCmpXchgOp = new DeleteCompareExchangeValueOperation("johnDoe@gmail.com", versionOfItem);
+
+        // Execute the operation by passing it to operations.send
+        const deleteResult = await documentStore.operations.send(deleteCmpXchgOp);
+
+        // Verify delete results:
+        assert.ok(deleteResult.successful);
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+const deleteCmpXchgOp = new DeleteCompareExchangeValueOperation(key, index, clazz?);
+//endregion
+
+//region syntax_2 
+// Return value of store.operations.send(deleteCmpXchgOp)
+// ======================================================
+class CompareExchangeResult {
+    successful;
+    value;
+    index;
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValue.js b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValue.js
new file mode 100644
index 0000000000..805657f970
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValue.js
@@ -0,0 +1,105 @@
+import { DocumentStore } from "ravendb";
+import assert from "assert";
+
+const documentStore = new DocumentStore();
+
+async function getCompareExchangeValue() {
+    {
+        //region get_1
+        // Put a new compare-exchange item,
+        // e.g. save the number of sales made by an employee as the value + some metadata info        
+        const putCmpXchgOp = new PutCompareExchangeValueOperation("employees/1-A", 12345, 0,{
+            "Department": "Sales",
+            "Role": "Salesperson",
+        });
+        const result = await documentStore.operations.send(putCmpXchgOp);
+
+        // Get the compare-exchange item:
+        // ==============================
+        
+        // Define the get compare-exchange operation, pass the unique item key
+        const getCmpXchgOp = new GetCompareExchangeValueOperation("employees/1-A");
+        
+        // Execute the operation by passing it to operations.send
+        const item = await documentStore.operations.send(getCmpXchgOp);
+        
+        // Access the value and metadata of the retrieved item
+        const numberOfSales = item.value;
+        const employeeRole = item.metadata["Role"];
+        
+        // Access the version number of the retrieved item
+        const version = item.index;
+        //endregion
+    }
+    {
+        //region get_2
+        // Put a new compare-exchange item,
+        // e.g. save an object as the value
+        const employee = new Employee();
+        employee.role = "Salesperson"
+        employee.department = "Sales";
+        employee.numberOfSales = 12345;
+
+        const putCmpXchgOp = new PutCompareExchangeValueOperation("employees/1-A", employee, 0);
+        const result = await documentStore.operations.send(putCmpXchgOp);
+
+        // Get the compare-exchange item:
+        // ==============================
+
+        // Define the get compare-exchange operation, pass the unique item key & the class type
+        const getCmpXchgOp = new GetCompareExchangeValueOperation("employees/1-A", Employee);
+
+        // Execute the operation by passing it to operations.send
+        const item = await documentStore.operations.send(getCmpXchgOp);
+
+        // Access the value of the retrieved item
+        const employeeResult = item.value;
+        const employeeClass = employeeResult.constructor;   // Employee
+
+        const employeeRole = employeeResult.role;           // Salesperson
+        const employeeDep = employeeResult.department;      // Sales
+        const employeeSales = employeeResult.numberOfSales; // 12345
+
+        // Access the version number of the retrieved item
+        const version = item.index;
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+const getCmpXchgOp = new GetCompareExchangeValueOperation(key, clazz, materializeMetadata);
+//endregion
+
+//region syntax_2 
+// Return value of store.operations.send(getCmpXchgOp)
+// ===================================================
+class CompareExchangeValue {
+    key;
+    value;
+    metadata;
+    index;
+}
+//endregion
+
+//region employee_class
+class Employee {
+    constructor(
+        id = null,
+        department = "",
+        role = "",
+        numberOfSales = 0
+
+    ) {
+        Object.assign(this, {
+            id,
+            department,
+            role,
+            numberOfSales
+        });
+    }
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValues.js b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValues.js
new file mode 100644
index 0000000000..8dd1db33c3
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/getCompareExchangeValues.js
@@ -0,0 +1,93 @@
+import { DocumentStore } from "ravendb";
+import assert from "assert";
+
+const documentStore = new DocumentStore();
+
+async function getCompareExchangeValues() {
+    {
+        //region get_values_1
+        // Save some new compare-exchange items
+        await documentStore.operations.send(
+            new PutCompareExchangeValueOperation("employees/1-A", "someValue1", 0));
+        await documentStore.operations.send(
+            new PutCompareExchangeValueOperation("employees/2-A", "someValue2", 0));
+        await documentStore.operations.send(
+            new PutCompareExchangeValueOperation("employees/3-A", "someValue3", 0));
+
+        // Get multiple compare-exchange items by specifying keys:
+        // =======================================================
+
+        // Define the get compare-exchange operation,
+        // Specify the keys of the items to get 
+        const getCmpXchgOp = new GetCompareExchangeValuesOperation({
+            keys: ["employees/1-A", "employees/3-A"]
+        });
+
+        // Execute the operation by passing it to operations.send
+        const items = await documentStore.operations.send(getCmpXchgOp);
+
+        // Access the returned items:
+        assert.equal(Object.keys(items).length, 2);
+        assert.equal(items["employees/1-A"].value, "someValue1");
+        assert.equal(items["employees/3-A"].value, "someValue3");
+        //endregion
+    }
+    {
+        //region get_values_2
+        // Get multiple compare-exchange items with common key prefix:
+        // ===========================================================
+
+        // Define the get compare-exchange operation, specify:
+        // * startWith: The common key prefix
+        // * pageSize:  Max items to get (this is optional)
+        // * start:     The start position (this is optional)
+        const getCmpXchgOp = new GetCompareExchangeValuesOperation({
+            startWith: "employees",
+            pageSize: 10,
+            start: 0
+        });
+
+        // Execute the operation by passing it to operations.send
+        const items = await documentStore.operations.send(getCmpXchgOp);
+
+        // Results will include only cmpXchg items with keys that start with "employees" 
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+const getCmpXchgOp = new GetCompareExchangeValuesOperation(parameters);
+//endregion
+
+//region syntax_2 
+// the parameters object:
+{
+    // Keys of the items to retrieve 
+    keys?; // string[]
+
+    // The common key prefix of the items to retrieve
+    startWith?; // string
+    
+    // The number of items that should be skipped
+    start?; // number
+    
+    // The maximum number of values that will be retrieved
+    pageSize?; // number
+    
+    // When the item's value is a class, you can specify its type in this parameter
+    clazz?; // object
+}
+//endregion
+
+//region syntax_3 
+class CompareExchangeValue {
+    key;
+    value;
+    metadata;
+    index;
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/includeCompareExchange.js b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/includeCompareExchange.js
new file mode 100644
index 0000000000..572ff7fb5d
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/includeCompareExchange.js
@@ -0,0 +1,329 @@
+import { DocumentStore } from "ravendb";
+import assert from "assert";
+
+const documentStore = new DocumentStore();
+
+async function putCompareExchange() {
+    {
+        //region sample_data
+        {
+            // Create some company documents:
+            // ==============================
+
+            const session = documentStore.openSession();
+
+            const company1 = new Company();
+            company1.id = "companies/1";
+            company1.name = "Apple";
+            company1.supplier = "suppliers/1";
+            company1.workers = ["employees/1", "employees/2"];
+
+            const company2 = new Company("companies/2", "Google", "suppliers/2", ["employees/3", "employees/4"]);
+            const company3 = new Company("companies/3", "Microsoft", "suppliers/3", ["employees/6", "employees/5"]);
+
+            await session.store(company1);
+            await session.store(company2);
+            await session.store(company3);
+
+            await session.saveChanges();
+        }
+        {
+            // Create some CmpXchg items:
+            // ==========================
+
+            // Open a session with cluster-wide mode so that we can call 'createCompareExchangeValue'
+            const session = documentStore.openSession({
+                transactionMode: "ClusterWide"
+            });
+
+            session.advanced.clusterTransaction.createCompareExchangeValue("employee/1", "content for employee 1 ..");
+            session.advanced.clusterTransaction.createCompareExchangeValue("employee/2", "content for employee 2 ..");
+            session.advanced.clusterTransaction.createCompareExchangeValue("employee/3", "content for employee 3 ..");
+
+            session.advanced.clusterTransaction.createCompareExchangeValue("suppliers/1", "content for supplier 1 ..");
+            session.advanced.clusterTransaction.createCompareExchangeValue("suppliers/2", "content for supplier 2 ..");
+            session.advanced.clusterTransaction.createCompareExchangeValue("suppliers/3", "content for supplier 3 ..");
+            
+            await session.saveChanges();
+        }
+        //endregion
+    }
+    {
+        //region include_1
+        // Open a session with cluster-wide mode to enable calling 'includeCompareExchangeValue'
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Load a company document + include a CmpXchg item:
+        // =================================================
+
+        // Call 'includeCompareExchangeValue' within the 'load' options,
+        // pass the PATH of the document property that contains the key of the CmpXchg item to include
+        const company1 = await session.load("companies/1", {
+            documentType: Company,
+            // "supplier" is the document property that holds the cmpXchg key 
+            includes: i => i.includeCompareExchangeValue("supplier")
+        });
+
+        // Calling 'load' has triggered a server call
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg item:
+        // =================================
+
+        // Call 'getCompareExchangeValue' to access the content of the included CmpXchg item,
+        // pass the cmpXchg item KEY. This will NOT trigger another server call.
+        const item = await session.advanced.clusterTransaction
+            .getCompareExchangeValue(company1.supplier);
+
+        // You can assert that no further server calls were made
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+
+        // The cmpXchg item value is available
+        const value = item.value;
+        //endregion
+    }
+    {
+        //region include_2
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Load a company document + include multiple CmpXchg items:
+        // =========================================================
+
+        // Call 'includeCompareExchangeValue' within the 'load' options,
+        // pass the PATH of the document property that contains the list keys of the CmpXchg items to include
+        const company1 = await session.load("companies/1", {
+            documentType: Company,
+            // "workers" is the document property that holds the list of keys 
+            includes: i => i.includeCompareExchangeValue("workers")
+        });
+
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg items:
+        // ==================================
+
+        // Call 'getCompareExchangeValues' to access the content of the included CmpXchg items, 
+        // pass the list of KEYS. This will NOT trigger another server call.
+        const items = await session.advanced.clusterTransaction
+            .getCompareExchangeValues(company1.workers);
+
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+
+        // The value of each item is available
+        const value1 = items["employees/1"].value;
+        const value2 = items["employees/2"].value;
+        //endregion
+    }
+    {
+        //region include_3
+        // Open a session with cluster-wide mode to enable calling 'includeCompareExchangeValue'
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Make a dynamic query + include CmpXchg items:
+        // =============================================
+
+        const companies = await session.query({ collection: "companies" })
+            // Call 'include' with 'includeCompareExchangeValue'
+            // pass the PATH of the document property that contains the key of the CmpXchg item to include  
+            .include(x => x.includeCompareExchangeValue("supplier"))
+            .all();
+
+        // Making the query has triggered a server call
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg items:
+        // ==================================
+
+        const cmpXchgItems = [];
+
+        for (let i = 0; i < companies.length; i++) {
+            // Call 'getCompareExchangeValues' to access the content of the included CmpXchg items,
+            // pass the KEY. This will NOT trigger another server call.
+            const item = await session.advanced.clusterTransaction
+                .getCompareExchangeValue(companies[i].supplier);
+
+            cmpXchgItems.push(item);
+        }
+
+        // You can assert that no further server calls were made
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+        //endregion
+    }
+    {
+        //region include_4
+        // Open a session with cluster-wide mode to enable calling 'include cmpxchg'
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Make a raw query + include CmpXchg items:
+        // =========================================
+
+        // In the provided RQL:
+        // * Call 'include' with 'cmpxchg'
+        // * Pass the PATH of the document property that contains the key of the CmpXchg item to include  
+        const companies = await session.advanced
+            .rawQuery(`from companies as c
+                       select c
+                       include cmpxchg(c.supplier)`)
+            .all();
+
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg items:
+        // ==================================
+
+        const cmpXchgItems = [];
+
+        for (let i = 0; i < companies.length; i++) {
+            // Call 'getCompareExchangeValues' to access the content of the included CmpXchg items, pass the KEY,
+            // this will NOT trigger another server call
+            const item = await session.advanced.clusterTransaction
+                .getCompareExchangeValue(companies[i].supplier);
+
+            cmpXchgItems.push(item);
+        }
+        
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+        //endregion
+    }
+    {
+        //region include_5
+        // Open a session with cluster-wide mode to enable calling 'includes.cmpxchg'
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Make a raw query + include CmpXchg items using Javascript method:
+        // =================================================================
+
+        // In the provided RQL:
+        // * Call 'includes.cmpxchg'
+        // * Pass the PATH of the document property that contains the key of the CmpXchg item to include  
+        const companies = await session.advanced
+            .rawQuery(`declare function includeCmpXchg(company) {
+                          includes.cmpxchg(company.supplier);
+                          return company;
+                     }
+                     
+                    from companies as c
+                    select includeCmpXchg(c)`)
+            .all();
+
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg items:
+        // ==================================
+
+        const cmpXchgItems = [];
+
+        for (let i = 0; i < companies.length; i++) {
+            // Call 'getCompareExchangeValues' to access the content of the included CmpXchg items,
+            // pass the KEY. This will NOT trigger another server call
+            const item = await session.advanced.clusterTransaction
+                .getCompareExchangeValue(companies[i].supplier);
+
+            cmpXchgItems.push(item);
+        }
+
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+        //endregion
+    }
+    {
+        //region include_6
+        const session = documentStore.openSession({
+            transactionMode: "ClusterWide"
+        });
+
+        // Make an index query + include CmpXchg items:
+        // ============================================
+
+        // Call 'include' with 'includeCompareExchangeValue'
+        // pass the PATH of the document property that contains the key of the CmpXchg item to include
+        const companies = await session.query({ indexName: "Companies/ByName" })
+            .include(x => x.includeCompareExchangeValue("supplier"))
+            .all();
+        
+        const numberOfRequests = session.advanced.numberOfRequests;
+        assert.equal(numberOfRequests, 1);
+
+        // Access the included CmpXchg items:
+        // ==================================
+
+        const cmpXchgItems = [];
+
+        for (let i = 0; i < companies.length; i++) {
+            // Call 'getCompareExchangeValues' to access the content of the included CmpXchg items,
+            // pass the KEY. This will NOT trigger another server call
+            const item = await session.advanced.clusterTransaction
+                .getCompareExchangeValue(companies[i].supplier);
+
+            cmpXchgItems.push(item);
+        }
+
+        assert.equal(session.advanced.numberOfRequests, numberOfRequests);
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+includeCompareExchangeValue(path);
+//endregion
+
+//region syntax_2 
+// Return value of store.operations.send(putCmpXchgOp)
+// ===================================================
+class CompareExchangeResult {
+    successful;
+    value;
+    index;
+}
+//endregion
+
+//region sample_class
+class Company {
+    constructor(
+        id = null,
+        name = "",
+        supplier = "",
+        workers = []
+
+    ) {
+        Object.assign(this, {
+            id,
+            name,
+            supplier,
+            workers
+        });
+    }
+}
+//endregion
+
+//region index
+class Companies_ByName extends AbstractJavaScriptIndexCreationTask {
+    constructor() {
+        super();
+
+        this.map('companies', company => {
+            return {
+                name: company.name
+            };
+        });
+    }
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/putCompareExchange.js b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/putCompareExchange.js
new file mode 100644
index 0000000000..36b8cffcf0
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/compareExchange/putCompareExchange.js
@@ -0,0 +1,105 @@
+import { DocumentStore } from "ravendb";
+import assert from "assert";
+
+const documentStore = new DocumentStore();
+
+async function putCompareExchange() {
+    {
+        //region put_1
+        // Create a new CmpXchg item:
+        // ==========================
+        
+        // Define the put compare-exchange operation. Pass:
+        // * KEY: a new unique identifier (e.g. a user's email)
+        // * VALUE: an associated value (e.g. the user's name)
+        // * INDEX: pass '0' to indicate that this is a new key
+        const putCmpXchgOp = new PutCompareExchangeValueOperation("johnDoe@gmail.com", "John Doe", 0);
+        
+        // Execute the operation by passing it to operations.send
+        const result = await documentStore.operations.send(putCmpXchgOp);
+        
+        // Check results
+        const successful = result.successful; // Has operation succeeded
+        const indexForItem = result.index;    // The version number assigned to the new item
+        
+        // If successful is true then a new compare-exchange item has been created
+        // with the unique email key and the associated value.
+        //endregion
+    }
+    {
+        //region put_2
+        // Create a new CmpXchg item with metadata:
+        // ========================================
+
+        // Define the put compare-exchange operation.
+        // Pass a 4'th parameter with the metadata object.
+        const putCmpXchgOp = new PutCompareExchangeValueOperation("+48-123-456-789", "John Doe", 0,
+            { 
+                "Provider": "T-Mobile",
+                "Network": "5G",
+                "Work phone": false
+            });
+
+        // Execute the operation by passing it to operations.send
+        const result = await documentStore.operations.send(putCmpXchgOp);
+
+        // Check results
+        const successful = result.successful; // Has operation succeeded
+        const indexForItem = result.index;    // The version number assigned to the new item
+
+        // If successful is true then a new compare-exchange item has been created
+        // with the unique phone number key, value, and metadata.
+        //endregion
+    }
+    {
+        //region put_3
+        // Modify an existing CmpXchg item:
+        // ================================
+
+        // Get the existing compare-exchange item
+        const item = await documentStore.operations.send(
+            new GetCompareExchangeValueOperation("+48-123-456-789")
+        );
+
+        // Make some changes
+        const newValue = "Jane Doe";
+        const metadata = item.metadata;
+        metadata["Work phone"] = true;
+
+        // Update the compare-exchange item:
+        // The put operation will succeed only if the 'index' of the compare-exchange item
+        // has not changed between the read and write operations.
+        const result = await documentStore.operations.send(
+            new PutCompareExchangeValueOperation("+48-123-456-789", newValue, item.index, metadata)
+        );
+
+        // Check results
+        const successful = result.successful; // Has operation succeeded
+        const newIndex = result.index;        // The new version number assigned to the item 
+
+        // Version has increased
+        assert(newIndex > item.index);
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+// Available overloads:
+// ====================
+const putCmpXchgOp = new PutCompareExchangeValueOperation(key, value, index);
+const putCmpXchgOp = new PutCompareExchangeValueOperation(key, value, index, metadata);
+//endregion
+
+//region syntax_2 
+// Return value of store.operations.send(putCmpXchgOp)
+// ===================================================
+class CompareExchangeResult {
+    successful;
+    value;
+    index;
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/counters/countersBatch.js b/Documentation/6.1/Samples/nodejs/client-api/operations/counters/countersBatch.js
new file mode 100644
index 0000000000..684a4615e6
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/counters/countersBatch.js
@@ -0,0 +1,222 @@
+import { DocumentStore } from "ravendb";
+
+const documentStore = new DocumentStore();
+
+async function countersBatch() {
+    {
+        //region example_1
+        // Define the counter actions you want to make per document:
+        // =========================================================
+        
+        const counterActions1 = new DocumentCountersOperation();
+        counterActions1.documentId = "users/1";
+        counterActions1.operations = [
+            CounterOperation.create("Likes", "Increment", 5), // Increment "Likes" by 5
+            CounterOperation.create("Dislikes", "Increment")  // No delta specified, value will stay the same
+        ];
+
+        const counterActions2 = new DocumentCountersOperation();
+        counterActions2.documentId = "users/2";
+        counterActions2.operations = [
+            CounterOperation.create("Likes", "Increment", 100), // Increment "Likes" by 100
+            CounterOperation.create("Score", "Increment", 50)   // Create a new counter "Score" with value 50
+        ];
+        
+        // Define the batch:
+        // =================
+        const batch = new CounterBatch();
+        batch.documents = [counterActions1, counterActions2];
+        
+        // Define the counter batch operation, pass the batch:
+        // ===================================================
+        const counterBatchOp = new CounterBatchOperation(batch);
+
+        // Execute the operation by passing it to operations.send:
+        // =======================================================
+        const result = await documentStore.operations.send(counterBatchOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_2
+        // Define the counter actions you want to make per document:
+        // =========================================================
+
+        const counterActions1 = new DocumentCountersOperation();
+        counterActions1.documentId = "users/1";
+        counterActions1.operations = [
+            CounterOperation.create("Likes", "Get"),
+            CounterOperation.create("Downloads", "Get")
+        ];
+
+        const counterActions2 = new DocumentCountersOperation();
+        counterActions2.documentId = "users/2";
+        counterActions2.operations = [
+            CounterOperation.create("Likes", "Get"),
+            CounterOperation.create("Score", "Get")
+        ];
+
+        // Define the batch:
+        // =================
+        const batch = new CounterBatch();
+        batch.documents = [counterActions1, counterActions2];
+
+        // Define the counter batch operation, pass the batch:
+        // ===================================================
+        const counterBatchOp = new CounterBatchOperation(batch);
+
+        // Execute the operation by passing it to operations.send:
+        // =======================================================
+        const result = await documentStore.operations.send(counterBatchOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_3
+        // Define the counter actions you want to make per document:
+        // =========================================================
+
+        const counterActions1 = new DocumentCountersOperation();
+        counterActions1.documentId = "users/1";
+        counterActions1.operations = [
+            // "Likes" and "Dislikes" will be removed from counter-names in "users/1" metadata
+            CounterOperation.create("Likes", "Delete"),
+            CounterOperation.create("Dislikes", "Delete")
+        ];
+
+        const counterActions2 = new DocumentCountersOperation();
+        counterActions2.documentId = "users/2";
+        counterActions2.operations = [
+            // "Downloads" will be removed from counter-names in "users/2" metadata
+            CounterOperation.create("Downloads", "Delete")
+        ];
+
+        // Define the batch:
+        // =================
+        const batch = new CounterBatch();
+        batch.documents = [counterActions1, counterActions2];
+
+        // Define the counter batch operation, pass the batch:
+        // ===================================================
+        const counterBatchOp = new CounterBatchOperation(batch);
+
+        // Execute the operation by passing it to operations.send:
+        // =======================================================
+        const result = await documentStore.operations.send(counterBatchOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_4
+        // Define the counter actions you want to make per document:
+        // =========================================================
+
+        const counterActions1 = new DocumentCountersOperation();
+        counterActions1.documentId = "users/1";
+        counterActions1.operations = [
+            CounterOperation.create("Likes", "Increment", 30),
+            // The results will include null for this 'Get' 
+            // since we deleted the "Dislikes" counter in the previous example flow
+            CounterOperation.create("Dislikes", "Get"), 
+            CounterOperation.create("Downloads", "Delete")
+        ];
+
+        const counterActions2 = new DocumentCountersOperation();
+        counterActions2.documentId = "users/2";
+        counterActions2.operations = [
+            CounterOperation.create("Likes", "Get"),
+            CounterOperation.create("Dislikes", "Delete")
+        ];
+
+        // Define the batch:
+        // =================
+        const batch = new CounterBatch();
+        batch.documents = [counterActions1, counterActions2];
+
+        // Define the counter batch operation, pass the batch:
+        // ===================================================
+        const counterBatchOp = new CounterBatchOperation(batch);
+
+        // Execute the operation by passing it to operations.send:
+        // =======================================================
+        const result = await documentStore.operations.send(counterBatchOp);
+        const counters = result.counters;
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+const counterBatchOp = new CounterBatchOperation(counterBatch);
+//endregion
+
+//region syntax_2 
+// The CounterBatch object:
+// ========================
+{
+    // A list of "DocumentCountersOperation" objects
+    documents;
+    // A flag indicating if results should include a dictionary of counter values per database node
+    replyWithAllNodesValues;
+}
+//endregion
+
+//region syntax_3 
+// The DocumentCountersOperation object:
+// =====================================
+{
+    // Id of the document that holds the counters
+    documentId;
+    // A list of "CounterOperation" objects to perform
+    operations;
+}
+//endregion
+
+//region syntax_4 
+// The CounterOperation object:
+// ============================
+{
+    // The operation type: "Increment" | "Delete" | "Get" 
+    type;
+    // The counter name
+    counterName;
+    // The value to increment by
+    delta;
+}
+//endregion
+
+//region syntax_5
+// The CounterDetails object:
+// ==========================
+{
+    // A list of "CounterDetail" objects;
+    counters;
+}
+//endregion
+
+//region syntax_6
+// The CounterDetail object:
+// =========================
+{
+    // ID of the document that holds the counter;
+    documentId; // string
+    
+    // The counter name
+    counterName; //string
+
+    // Total counter value
+    totalValue; // number    
+    
+    // A dictionary of counter values per database node
+    counterValues?; 
+    
+    // Etag of counter
+    etag?; // number;
+
+    // Change vector of counter
+    changeVector?; // string
+}
+//endregion
+
+//endregion
diff --git a/Documentation/6.1/Samples/nodejs/client-api/operations/counters/getCounters.js b/Documentation/6.1/Samples/nodejs/client-api/operations/counters/getCounters.js
new file mode 100644
index 0000000000..914a34ae3c
--- /dev/null
+++ b/Documentation/6.1/Samples/nodejs/client-api/operations/counters/getCounters.js
@@ -0,0 +1,94 @@
+import { DocumentStore } from "ravendb";
+
+const documentStore = new DocumentStore();
+
+async function getCounters() {
+    {
+        //region example_1
+        // Define the get counters operation
+        const getCountersOp = new GetCountersOperation("users/1", "Likes");
+
+        // Execute the operation by passing it to operations.send
+        const result = await documentStore.operations.send(getCountersOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_2
+        const getCountersOp = new GetCountersOperation("users/1", ["Likes", "Dislikes"]);
+
+        const result = await documentStore.operations.send(getCountersOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_3
+        const getCountersOp = new GetCountersOperation("users/1");
+
+        const result = await documentStore.operations.send(getCountersOp);
+        const counters = result.counters;
+        //endregion
+    }
+    {
+        //region example_4
+        const getCountersOp = new GetCountersOperation("users/1", "Likes", true);
+
+        const result = await documentStore.operations.send(getCountersOp);
+        const counters = result.counters;
+        //endregion
+    }
+}
+
+//region syntax
+
+//region syntax_1 
+// Get single counter
+const getCountersOp = new GetCountersOperation(docId, counter);
+const getCountersOp = new GetCountersOperation(docId, counter, returnFullResults = false);
+//endregion
+
+//region syntax_2 
+// Get multiple counters
+const getCountersOp = new GetCountersOperation(docId, counters);
+const getCountersOp = new GetCountersOperation(docId, counters, returnFullResults = false);
+//endregion
+
+//region syntax_3 
+// Get all counters of a document
+const getCountersOp = new GetCountersOperation(docId);
+//endregion
+
+//region syntax_4
+// The CounterDetails object:
+// ==========================
+{
+    // A list of "CounterDetail" objects;
+    counters;
+}
+//endregion
+
+//region syntax_5
+// The CounterDetail object:
+// =========================
+{
+    // ID of the document that holds the counter;
+    documentId; // string
+    
+    // The counter name
+    counterName; //string
+
+    // Total counter value
+    totalValue; // number
+    
+    // A dictionary of counter values per database node
+    counterValues?; 
+    
+    // Etag of counter
+    etag?; // number;
+
+    // Change vector of counter
+    changeVector?; // string
+}
+//endregion
+
+//endregion