diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponse.php b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
index fcb45af..d85476c 100644
--- a/core/lib/Drupal/Core/Ajax/AjaxResponse.php
+++ b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
@@ -65,6 +65,9 @@ public function setAttachments(array $attachments) {
    *   The current AjaxResponse.
    */
   public function addCommand(CommandInterface $command, $prepend = FALSE) {
+    if ($command instanceof ResponseAwareCommandInterface) {
+      $command->setResponse($this);
+    }
     if ($prepend) {
       array_unshift($this->commands, $command->render());
     }
diff --git a/core/lib/Drupal/Core/Ajax/InsertCommand.php b/core/lib/Drupal/Core/Ajax/InsertCommand.php
index 2a31e3e..3235930 100644
--- a/core/lib/Drupal/Core/Ajax/InsertCommand.php
+++ b/core/lib/Drupal/Core/Ajax/InsertCommand.php
@@ -21,7 +21,9 @@
  *
  * @ingroup ajax
  */
-class InsertCommand implements CommandInterface {
+class InsertCommand implements CommandInterface, ResponseAwareCommandInterface {
+
+  use ResponseAwareCommandTrait;
 
   /**
    * A CSS selector string.
@@ -67,26 +69,6 @@ public function __construct($selector, $content, array $settings = NULL) {
   }
 
   /**
-   * Processes the content for output.
-   *
-   * If content is a render array, it may contain attached assets to be
-   * processed.
-   *
-   * @return string
-   *   HTML rendered content.
-   */
-  protected function getRenderedContent() {
-    if (is_array($this->content)) {
-      $html = \Drupal::service('renderer')->render($this->content);
-      drupal_process_attached($this->content);
-      return $html;
-    }
-    else {
-      return $this->content;
-    }
-  }
-
-  /**
    * Implements Drupal\Core\Ajax\CommandInterface:render().
    */
   public function render() {
diff --git a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index b4793c5..1b1caf2 100644
--- a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -14,7 +14,9 @@
  *
  * @ingroup ajax
  */
-class OpenDialogCommand implements CommandInterface {
+class OpenDialogCommand implements CommandInterface, ResponseAwareCommandInterface {
+
+  use ResponseAwareCommandTrait;
 
   /**
    * The selector of the dialog.
@@ -125,26 +127,6 @@ public function setDialogTitle($title) {
   }
 
   /**
-   * Processes the content for output.
-   *
-   * If content is a render array, it may contain attached assets to be
-   * processed.
-   *
-   * @return string
-   *   HTML rendered content.
-   */
-  protected function getRenderedContent() {
-    if (is_array($this->content)) {
-      $html = \Drupal::service('renderer')->render($this->content);
-      drupal_process_attached($this->content);
-      return $html;
-    }
-    else {
-      return $this->content;
-    }
-  }
-
-  /**
    * Implements \Drupal\Core\Ajax\CommandInterface:render().
    */
   public function render() {
diff --git a/core/lib/Drupal/Core/Ajax/ResponseAwareCommandInterface.php b/core/lib/Drupal/Core/Ajax/ResponseAwareCommandInterface.php
new file mode 100644
index 0000000..a9b17ad
--- /dev/null
+++ b/core/lib/Drupal/Core/Ajax/ResponseAwareCommandInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Ajax\ResponseAwareCommandInterface.
+ */
+
+namespace Drupal\Core\Ajax;
+
+/**
+ * Response aware interface for Ajax commands.
+ *
+ * All Ajax commands that render HTML should implement these methods
+ * to be able to access the calling AjaxResponse object.
+ *
+ * @ingroup ajax
+ */
+interface ResponseAwareCommandInterface {
+
+  /**
+   * Set the calling AjaxResponse object.
+   *
+   * @param \Drupal\Core\Ajax\AjaxResponse $response
+   *   The AjaxResponse object.
+   *
+   * @return $this
+   */
+  public function setResponse(AjaxResponse $response);
+
+}
diff --git a/core/lib/Drupal/Core/Ajax/ResponseAwareCommandTrait.php b/core/lib/Drupal/Core/Ajax/ResponseAwareCommandTrait.php
new file mode 100644
index 0000000..97fb1dd
--- /dev/null
+++ b/core/lib/Drupal/Core/Ajax/ResponseAwareCommandTrait.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Ajax\ResponseAwareCommandTrait.
+ */
+
+namespace Drupal\Core\Ajax;
+
+/**
+ * Response aware trait for Ajax commands.
+ *
+ * @ingroup ajax
+ */
+trait ResponseAwareCommandTrait {
+
+  /**
+   * The selector of the dialog.
+   *
+   * @var \Drupal\Core\Ajax\AjaxResponse
+   */
+  protected $response;
+
+  /**
+   * Set the calling AjaxResponse object.
+   *
+   * @param \Drupal\Core\Ajax\AjaxResponse $response
+   *   The AjaxResponse object.
+   *
+   * @return $this
+   */
+  public function setResponse(AjaxResponse $response) {
+    $this->response = $response;
+    return $this;
+  }
+
+  /**
+   * Processes the content for output.
+   *
+   * If content is a render array, it may contain attached assets to be
+   * processed.
+   *
+   * @return string
+   *   HTML rendered content.
+   */
+  protected function getRenderedContent() {
+    if (is_array($this->content)) {
+      $html = \Drupal::service('renderer')->render($this->content);
+      $this->response->setAttachments($this->content['#attached']);
+      return $html;
+    }
+    else {
+      return $this->content;
+    }
+  }
+}