diff --git a/docs/versioned_docs/version-3.x/changelog.mdx b/docs/versioned_docs/version-3.x/changelog.mdx
index 9a6177e3632c..b574a76b1b96 100644
--- a/docs/versioned_docs/version-3.x/changelog.mdx
+++ b/docs/versioned_docs/version-3.x/changelog.mdx
@@ -16,6 +16,13 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.6.14] - 2023-11-17
+                        
+Rasa 3.6.14 (2023-11-17)                         
+### Bugfixes
+- [#12948](https://github.com/rasahq/rasa/issues/12948): Fixed UnexpecTEDIntentlessPolicy training errors that resulted from a change to batching behavior. Changed the batching behavior back to the original for all components. Made the changed batching behavior accessible in DietClassifier using `drop_small_last_batch: True`.
+
+
 ## [3.6.13] - 2023-10-23
                         
 Rasa 3.6.13 (2023-10-23)                         
diff --git a/docs/versioned_docs/version-3.x/reference/rasa/utils/tensorflow/data_generator.md b/docs/versioned_docs/version-3.x/reference/rasa/utils/tensorflow/data_generator.md
index 8b07923bcc82..27599835c1c2 100644
--- a/docs/versioned_docs/version-3.x/reference/rasa/utils/tensorflow/data_generator.md
+++ b/docs/versioned_docs/version-3.x/reference/rasa/utils/tensorflow/data_generator.md
@@ -108,7 +108,8 @@ def __init__(model_data: RasaModelData,
              batch_size: Union[List[int], int],
              epochs: int = 1,
              batch_strategy: Text = SEQUENCE,
-             shuffle: bool = True)
+             shuffle: bool = True,
+             drop_small_last_batch: bool = False)
 ```
 
 Initializes the increasing batch size data generator.
@@ -120,6 +121,8 @@ Initializes the increasing batch size data generator.
 - `epochs` - The total number of epochs.
 - `batch_strategy` - The batch strategy.
 - `shuffle` - If &#x27;True&#x27;, data will be shuffled.
+- `drop_small_last_batch` - if &#x27;True&#x27;, the last batch in an epoch will be dropped
+  if it has less examples than half the batch size
 
 #### \_\_len\_\_
 
diff --git a/docs/versioned_docs/version-3.x/reference/rasa/utils/train_utils.md b/docs/versioned_docs/version-3.x/reference/rasa/utils/train_utils.md
index 033d220b3a39..58e3ecb1b0c5 100644
--- a/docs/versioned_docs/version-3.x/reference/rasa/utils/train_utils.md
+++ b/docs/versioned_docs/version-3.x/reference/rasa/utils/train_utils.md
@@ -172,7 +172,8 @@ def create_data_generators(
     batch_strategy: Text = SEQUENCE,
     eval_num_examples: int = 0,
     random_seed: Optional[int] = None,
-    shuffle: bool = True
+    shuffle: bool = True,
+    drop_small_last_batch: bool = False
 ) -> Tuple[RasaBatchDataGenerator, Optional[RasaBatchDataGenerator]]
 ```
 
@@ -187,6 +188,8 @@ Create data generators for train and optional validation data.
 - `eval_num_examples` - Number of examples to use for validation data.
 - `random_seed` - The random seed.
 - `shuffle` - Whether to shuffle data inside the data generator.
+- `drop_small_last_batch` - whether to drop the last batch if it has fewer than half
+  a batch size of examples
   
 
 **Returns**:
diff --git a/docs/versioned_docs/version-3.x/sources/rasa_interactive___help.txt b/docs/versioned_docs/version-3.x/sources/rasa_interactive___help.txt
index dcc4d23cd63a..7f4a8d7785a2 100644
--- a/docs/versioned_docs/version-3.x/sources/rasa_interactive___help.txt
+++ b/docs/versioned_docs/version-3.x/sources/rasa_interactive___help.txt
@@ -39,7 +39,7 @@ options:
   --conversation-id CONVERSATION_ID
                         Specify the id of the conversation the messages are
                         in. Defaults to a UUID that will be randomly
-                        generated. (default: fcb5589b534f45e29748e38e9c75adc1)
+                        generated. (default: 6ae525c02bf54347a56fdfbe15d72b5c)
   --endpoints ENDPOINTS
                         Configuration file for the model server and the
                         connectors as a yml file. (default: endpoints.yml)
diff --git a/docs/versioned_docs/version-3.x/sources/rasa_shell___help.txt b/docs/versioned_docs/version-3.x/sources/rasa_shell___help.txt
index c91d2a5723ef..25c3dd2b1369 100644
--- a/docs/versioned_docs/version-3.x/sources/rasa_shell___help.txt
+++ b/docs/versioned_docs/version-3.x/sources/rasa_shell___help.txt
@@ -30,7 +30,7 @@ options:
   -h, --help            show this help message and exit
   --conversation-id CONVERSATION_ID
                         Set the conversation ID. (default:
-                        f7d4c64684f64dd98f5bb6b21902311d)
+                        01f80f80c9874ce7963666e53f8941ec)
   -m MODEL, --model MODEL
                         Path to a trained Rasa model. If a directory is
                         specified, it will use the latest model in this
diff --git a/docs/versioned_docs/version-3.x/variables.json b/docs/versioned_docs/version-3.x/variables.json
index 1a5bd7f25482..bd2bfe1b0336 100644
--- a/docs/versioned_docs/version-3.x/variables.json
+++ b/docs/versioned_docs/version-3.x/variables.json
@@ -1,4 +1,4 @@
 {
-    "release": "3.6.13",
+    "release": "3.6.14",
     "rasa_sdk_version": "3.6.2"
 }
\ No newline at end of file