diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index a29d452..93a9994 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -214,6 +214,9 @@ class ViewExecutable implements \Serializable {
    * The current used style plugin.
    *
    * @var \Drupal\views\Plugin\views\style\StylePluginBase
+   *
+   * @deprecated in Drupal 8.0.x and will be removed before 8.2.x. Use
+   *   getStylePlugin() instead to get this property.
    */
   public $style_plugin;
 
@@ -221,6 +224,10 @@ class ViewExecutable implements \Serializable {
    * The current used row plugin, if the style plugin supports row plugins.
    *
    * @var \Drupal\views\Plugin\views\row\RowPluginBase
+   *
+   * @deprecated in Drupal 8.0.x and will be removed before 8.2.x. Use
+   *   getRowlugin() instead to get this property.
+   *
    */
   public $rowPlugin;
 
@@ -846,6 +853,8 @@ public function newDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
    *
    * @return \Drupal\views\Plugin\views\style\StylePluginBase
    *   The current style plugin.
+   *
+   * @deprecated in Drupal 8.0.x and will be removed before 8.2.x.
    */
   public function getStyle() {
     if (!isset($this->style_plugin)) {
@@ -856,6 +865,35 @@ public function getStyle() {
   }
 
   /**
+   * Gets the current style plugin.
+   *
+   * @return \Drupal\views\Plugin\views\style\StylePluginBase
+   *   The current style plugin.
+   *
+   */
+  public function getStylePlugin() {
+    if (!isset($this->style_plugin)) {
+      $this->initStyle();
+    }
+
+    return $this->style_plugin;
+  }
+
+  /**
+   * Gets the current row plugin.
+   *
+   * @return \Drupal\views\Plugin\views\row\RowPluginBase
+   *   The current row plugin.
+   */
+  public function getRowPlugin() {
+    if (!isset($this->rowPlugin)) {
+      return;
+    }
+
+    return $this->rowPlugin;
+  }
+
+  /**
    * Finds and initializes the style plugin.
    *
    * Note that arguments may have changed which style plugin we use, so