diff --git a/api/opencl_runtime_layer.asciidoc b/api/opencl_runtime_layer.asciidoc
index bfa16ffd..926a0495 100644
--- a/api/opencl_runtime_layer.asciidoc
+++ b/api/opencl_runtime_layer.asciidoc
@@ -14369,8 +14369,10 @@ Otherwise, it returns one of the following errors:
   * {CL_INVALID_COMMAND_QUEUE} if _command_queue_ is not `NULL`.
   * {CL_INVALID_COMMAND_BUFFER_KHR} if _command_buffer_ is not a valid
     command-buffer.
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_ and
-    _command_buffer_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
   * {CL_INVALID_OPERATION} if _command_buffer_ has been finalized.
   * {CL_INVALID_VALUE} if _mutable_handle_ is not `NULL`.
   * {CL_INVALID_SYNC_POINT_WAIT_LIST_KHR} if _sync_point_wait_list_ is
@@ -14452,8 +14454,12 @@ Otherwise, it returns the errors defined by {clEnqueueCopyBuffer} except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, _src_buffer_, and _dst_buffer_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_,
+    _src_buffer_, and _dst_buffer_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -14557,8 +14563,12 @@ except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, _src_buffer_, and _dst_buffer_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_,
+    _src_buffer_, and _dst_buffer_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -14645,8 +14655,12 @@ except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, _src_buffer_, and _dst_image_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_,
+    _src_buffer_, and _dst_image_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -14739,8 +14753,12 @@ Otherwise, it returns the errors defined by {clEnqueueCopyImage} except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, _src_image_, and _dst_image_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_,
+    _src_image_, and _dst_image_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -14827,8 +14845,12 @@ except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, _src_image_, and _dst_buffer_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_,
+    _src_image_, and _dst_buffer_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -14922,8 +14944,12 @@ Otherwise, it returns the errors defined by {clEnqueueFillBuffer} except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, and _buffer_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_ and
+    _buffer_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -15015,8 +15041,12 @@ Otherwise, it returns the errors defined by {clEnqueueFillImage} except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, and _image_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_ and
+    _image_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -15259,8 +15289,12 @@ Otherwise, it returns the errors defined by {clEnqueueNDRangeKernel} except:
 
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, and _kernel_ are not the same.
+  * {CL_INVALID_CONTEXT} if the context associated with _command_buffer_ and
+    _kernel_ is not the same.
+ifdef::cl_khr_command_buffer_multi_device[]
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -15373,10 +15407,17 @@ Otherwise, it returns the errors defined by {clEnqueueSVMMemcpy} except:
     more than one queue, or _command_queue_ is not `NULL` and not a
     command-queue listed on _command_buffer_ creation.
 
+ifdef::cl_khr_command_buffer_multi_device[]
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, and _kernel_ are not the same.
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+
+endif::cl_khr_command_buffer_multi_device[]
+
+ifndef::cl_khr_command_buffer_multi_device[]
+{CL_INVALID_CONTEXT} error case is removed.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with:
 
@@ -15479,10 +15520,16 @@ successfully. Otherwise, it returns the errors defined by
     more than one queue, or _command_queue_ is not `NULL` and not a
     command-queue listed on _command_buffer_ creation.
 
+ifdef::cl_khr_command_buffer_multi_device[]
 {CL_INVALID_CONTEXT} is replaced with:
 
-  * {CL_INVALID_CONTEXT} if the context associated with _command_queue_,
-    _command_buffer_, and _kernel_ are not the same.
+  * {CL_INVALID_CONTEXT} if _command_queue_ is not `NULL`, and the context
+    associated with _command_queue_ and _command_buffer_ is not the same.
+endif::cl_khr_command_buffer_multi_device[]
+
+ifndef::cl_khr_command_buffer_multi_device[]
+{CL_INVALID_CONTEXT} error case is removed.
+endif::cl_khr_command_buffer_multi_device[]
 
 {CL_INVALID_EVENT_WAIT_LIST} is replaced with: