diff --git a/docs-aspnet-core/backwards-compatibility.md b/docs-aspnet-core/backwards-compatibility.md
index 410695b6a0b..246b6b04368 100644
--- a/docs-aspnet-core/backwards-compatibility.md
+++ b/docs-aspnet-core/backwards-compatibility.md
@@ -8,6 +8,30 @@ position: 250
 
 # Breaking Changes
 
+## Changes from 2018 R1
+
+To enable more complex widget configuration scenarios and ensure the tag-naming consistency across the Telerik UI for ASP.NET Core suite, the Kendo UI R1 2018 release introduces changes in the tags of the following wrappers:
+
+Dialog:
+
+* Previously, it was possible to nest content directly in the `<kendo-dialog>` tag while now, after the release, the content must be nested within a `<content>` tag.
+
+Window:
+
+* Previously, it was possible to nest content directly in the `<kendo-window>` tag while now, after the release, the content must be nested within a `<content>` tag.
+
+Upload:
+
+* The `<kendo-upload-async-settings>` tag name is changed to `<async>`
+* The `<kendo-upload-files>` tag name is changed to `<files>`.
+* The `<kendo-upload-file>` tag name is changed to `<file>`.
+* The `<kendo-upload-localization-settings>` tag name is changed to `<localization>`.
+* The `<kendo-upload-validation-settings>` tag name is changed to `<validation>`.
+
+Splitter:
+
+* Previously, the tag name of the pane was `<kendo-splitter-pane>` while now, after the release, it is changed to `<pane>`.
+
 [Telerik UI for ASP.NET Core](http://www.telerik.com/aspnet-core-ui) is a set of server-side wrappers that allows using the [Kendo UI widgets](../kendo-ui/introduction) from the server code.
 
 That is why, all important changes in the Kendo UI suite also apply to the client-side code and behavior of the Telerik UI for ASP.NET Core wrappers. For the list of all breaking changes, refer to the articles on the [Kendo UI breaking changes](../kendo-ui/backwards-compatibility/2017-backward-compatibility).
diff --git a/docs-aspnet-core/getting-started/getting-started.md b/docs-aspnet-core/getting-started/getting-started.md
index 3e9b8b4dc9a..57e6c3329c9 100644
--- a/docs-aspnet-core/getting-started/getting-started.md
+++ b/docs-aspnet-core/getting-started/getting-started.md
@@ -106,6 +106,7 @@ To add the NuGet packages:
 
             @using MyASPNETCoreProject
             @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+            @addTagHelper *, Kendo.Mvc
             @using Kendo.Mvc.UI
 
 6. Copy the Kendo UI client-side resources. You can use either of the following approaches:
diff --git a/docs-aspnet-core/helpers/html-helpers/autocomplete.md b/docs-aspnet-core/helpers/html-helpers/autocomplete.md
index bcee4edd621..c2a23d20d88 100644
--- a/docs-aspnet-core/helpers/html-helpers/autocomplete.md
+++ b/docs-aspnet-core/helpers/html-helpers/autocomplete.md
@@ -11,7 +11,7 @@ The AutoComplete HtmlHelper extension is a server-side wrapper for the [Kendo UI
 
 It enables you to configure the Kendo UI AutoComplete widget from server-side code. The [AutoComplete](http://docs.telerik.com/kendo-ui/controls/editors/autocomplete/overview) provides suggestions depending on the typed text. It also allows multiple value entries. The suggestions shown by the widget come either from a local array or from a remote data service.
 
-For more information on the HtmlHelper, refer to the article on the [AutoComplete HtmlHelper for ASP.NET MVC](http://demos.telerik.com/aspnet-mvc/autocomplete/index).
+For more information on the HtmlHelper, refer to the article on the [AutoComplete HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/autocomplete/overview).
 
 ## Basic Usage
 
diff --git a/docs-aspnet-core/helpers/html-helpers/button.md b/docs-aspnet-core/helpers/html-helpers/button.md
index 25be37f0ef5..1d340ec2fa3 100644
--- a/docs-aspnet-core/helpers/html-helpers/button.md
+++ b/docs-aspnet-core/helpers/html-helpers/button.md
@@ -11,7 +11,7 @@ The Button HtmlHelper extension is a server-side wrapper for the [Kendo UI Butto
 
 It enables you to configure the Kendo UI Button widget from server-side code. The [Button](http://docs.telerik.com/kendo-ui/controls/navigation/button/overview) provides a styled clickable UI functionality with arbitrary content. Apart from consistent Kendo UI styling, the Button provides keyboard operability for elements, which natively do not have it&mdash;for example, `span`.
 
-For more information on the HtmlHelper, refer to the article on the [Button HtmlHelper for ASP.NET MVC](http://docs.telerik.com/aspnet-mvc/helpers/upload/overview).
+For more information on the HtmlHelper, refer to the article on the [Button HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/button/overview).
 
 ## Basic Usage
 
diff --git a/docs-aspnet-core/helpers/html-helpers/combobox.md b/docs-aspnet-core/helpers/html-helpers/combobox.md
index b96c1c4a696..a8dea3d37e8 100644
--- a/docs-aspnet-core/helpers/html-helpers/combobox.md
+++ b/docs-aspnet-core/helpers/html-helpers/combobox.md
@@ -11,7 +11,7 @@ The ComboBox HtmlHelper extension is a server-side wrapper for the [Kendo UI Com
 
 It enables you to configure the Kendo UI ComboBox widget from server-side code. The [ComboBox](http://docs.telerik.com/kendo-ui/controls/editors/combobox/overview) enables the user to enter custom values through the keyboard. It represents a richer version of the `<select>` element and provides support for local and remote data binding, item templates, and configurable options for controlling the list behavior.
 
-For more information on the HtmlHelper, refer to the article on the [ComboBox HtmlHelper for ASP.NET MVC](http://demos.telerik.com/aspnet-mvc/combobox/index).
+For more information on the HtmlHelper, refer to the article on the [ComboBox HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/combobox/overview).
 
 ## Basic Usage
 
diff --git a/docs-aspnet-core/helpers/html-helpers/dropdownlist.md b/docs-aspnet-core/helpers/html-helpers/dropdownlist.md
index 8bbdfb68623..d0162532e65 100644
--- a/docs-aspnet-core/helpers/html-helpers/dropdownlist.md
+++ b/docs-aspnet-core/helpers/html-helpers/dropdownlist.md
@@ -11,7 +11,7 @@ The DropDownList HtmlHelper extension is a server-side wrapper for the [Kendo UI
 
 It allows you to configure the Kendo UI DropDownList widget from server-side code. The [DropDownList](http://docs.telerik.com/kendo-ui/controls/editors/dropdownlist/overview) displays a list of values and allows for a single selection from the list. The user input is restricted within the predefined options.
 
-For more information on the HtmlHelper, refer to the article on the [DropDownList HtmlHelper for ASP.NET MVC](http://docs.telerik.com/aspnet-mvc/helpers/dropdownlist/overview).
+For more information on the HtmlHelper, refer to the article on the [DropDownList HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/dropdownlist/overview).
 
 ## Basic Usage
 
diff --git a/docs/_plugins/api_generator.rb b/docs/_plugins/api_generator.rb
index 4c71b75fd08..5eeaab4603f 100644
--- a/docs/_plugins/api_generator.rb
+++ b/docs/_plugins/api_generator.rb
@@ -35,6 +35,7 @@ def initialize(site, base, dir, page_schema)
       self.data['parent_path'] = dir
       self.data['is_api'] = true
       self.data['publish'] = false
+      self.data.delete('previous_url')
     end
   end
 
@@ -191,7 +192,7 @@ def parse(markdown)
     def parse_element(element)
       description = ""
       if element.type === :codeblock
-        description += element_value(element).indent(4)
+        description += "\n#{element_value(element).indent(4)}"
       end
 
       if element.type === :blank
diff --git a/docs/controls/navigation/buttongroup/overview.md b/docs/controls/navigation/buttongroup/overview.md
index 867527d58a9..60f5e0a18fb 100644
--- a/docs/controls/navigation/buttongroup/overview.md
+++ b/docs/controls/navigation/buttongroup/overview.md
@@ -182,4 +182,6 @@ Kendo UI ButtonGroup container has a `role=group` attribute that semantically de
 Other articles on Kendo UI ButtonGroup:
 
 * [Overview of the ASP.NET MVC HtmlHelper Extension for the ButtonGroup Widget](http://docs.telerik.com/aspnet-mvc/helpers/buttongroup/overview)
+* [Overview of the ButtonGroup JSP Tag]({% slug overview_buttongroup_uiforjsp %})
+* [Overview of the ButtonGroup PHP Class]({% slug overview_buttongroup_uiforphp %})
 * [ButtonGroup JavaScript API Reference](/api/javascript/ui/buttongroup)
diff --git a/docs/jsp/tags/buttongroup/overview.md b/docs/jsp/tags/buttongroup/overview.md
new file mode 100644
index 00000000000..8784e4dc0a1
--- /dev/null
+++ b/docs/jsp/tags/buttongroup/overview.md
@@ -0,0 +1,93 @@
+---
+title: Overview
+page_title: Overview | ButtonGroup JSP Tag
+description: "Get started with the ButtonGroup JSP tag in Kendo UI."
+slug: overview_buttongroup_uiforjsp
+position: 1
+---
+
+# ButtonGroup JSP Tag Overview
+
+The ButtonGroup JSP tag is a server-side wrapper for the [Kendo UI ButtonGroup](/api/javascript/ui/buttongroup) widget.
+
+## Getting Started
+
+Make sure you are familiar with some of the fundamental [Kendo UI widget concepts]({% slug getting_started_installation_kendoui %}) and
+that the [Kendo UI Java wrappers]({% slug overview_uiforjsp %}) are set up correctly.
+
+### The Basics
+
+The ButtonGroup widget groups a series of buttons together on a single line.
+
+### Initialization
+
+The example below demonstrates how to initialize the ButtonGroup by using the default `buttongroup` tag.
+
+###### Example
+
+    <kendo:buttonGroup name="select-period">
+    	<kendo:buttonGroup-items>
+	    	<kendo:buttonGroup-item text="Month">
+	    	</kendo:buttonGroup-item>
+	    	<kendo:buttonGroup-item text="Quarter">
+	    	</kendo:buttonGroup-item>
+	    	<kendo:buttonGroup-item text="Year">
+	    	</kendo:buttonGroup-item>
+    	</kendo:buttonGroup-items>
+    </kendo:buttonGroup>
+
+## Features
+
+### Enable and Disable ButtonGroup
+
+You can configure the ButtonGroup to be initially disabled by using its `enable` property. The ButtonGroup can also be disabled or enabled at any time with JavaScript by using the `enable()` method with a Boolean argument.
+
+The following example demonstrates how to enable and disable the ButtonGroup.
+
+###### Example
+
+    <kendo:buttonGroup name="select-period" enable="false">
+    	<kendo:buttonGroup-items>
+	    	<kendo:buttonGroup-item text="Month">
+	    	</kendo:buttonGroup-item>
+	    	<kendo:buttonGroup-item text="Quarter">
+	    	</kendo:buttonGroup-item>
+	    	<kendo:buttonGroup-item text="Year">
+	    	</kendo:buttonGroup-item>
+    	</kendo:buttonGroup-items>
+    </kendo:buttonGroup>
+
+For more information on the [`enable` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-enable), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
+
+### Index
+
+The initially selected index of the ButtonGroup can be configured by using its `index` property. An index can also be selected over the `select()` method with an Integer argument.
+
+The following example demonstrates how to select a button by its index.
+
+    <kendo:buttonGroup name="align" selection="single" index="0">
+        <kendo:buttonGroup-items>
+            <kendo:buttonGroup-item icon="align-left">
+            </kendo:buttonGroup-item>
+            <kendo:buttonGroup-item icon="align-center">
+            </kendo:buttonGroup-item>
+            <kendo:buttonGroup-item icon="align-right">
+            </kendo:buttonGroup-item>
+        </kendo:buttonGroup-items>
+    </kendo:buttonGroup>
+
+For more information on the [`select` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-select), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
+
+## Reference
+
+### Existing Instance
+
+To reference an existing ButtonGroup instance, refer to the [introductory article on the ButtonGroup]({% slug overview_kendoui_buttongroup_widget %}#reference).
+
+## See Also
+
+Other articles on Telerik UI for JSP and on the ButtonGroup:
+
+* [Overview of the Kendo UI ButtonGroup Widget]({% slug overview_kendoui_buttongroup_widget %})
+* [Telerik UI for JSP API Reference Folder](/api/jsp/autocomplete/animation)
+* [Telerik UI for JSP Tags Folder]({% slug overview_autocomplete_uiforjsp %})
diff --git a/docs/php/widgets/buttongroup/overview.md b/docs/php/widgets/buttongroup/overview.md
new file mode 100644
index 00000000000..e798062059b
--- /dev/null
+++ b/docs/php/widgets/buttongroup/overview.md
@@ -0,0 +1,91 @@
+---
+title: Overview
+page_title: Overview | ButtonGroup PHP Class
+description: "Get started with the ButtonGroup PHP class in Kendo UI."
+slug: overview_buttongroup_uiforphp
+position: 1
+---
+
+# ButtonGroup PHP Class Overview
+
+The Kendo UI ButtonGroup for PHP is a server-side wrapper for the [Kendo UI ButtonGroup](/api/javascript/ui/buttongroup) widget.
+
+## Getting Started
+
+Make sure you are familiar with some of the fundamental [Kendo UI widget concepts]({% slug initialize_widgets_using_jquery_plugins_installation %}) and that the [Kendo UI PHP wrappers]({% slug overview_uiforphp %}) are setup correctly.
+
+### The Basics
+
+The ButtonGroup widget groups a series of buttons together on a single line.
+
+### Initialization
+
+The example below demonstrates how to initialize the ButtonGroup by using the default `buttongroup` tag.
+
+###### Example
+
+    $buttonGroup = new \Kendo\UI\ButtonGroup('select-period');
+    $month = new \Kendo\UI\ButtonGroupItem();
+    $month->text("Month");
+    $quarter = new \Kendo\UI\ButtonGroupItem();
+    $quarter->text("Quarter");
+    $year = new \Kendo\UI\ButtonGroupItem();
+    $year->text("Year");
+
+    $buttonGroup->addItem($month, $quarter, $year);
+
+    echo $buttonGroup->render();
+
+## Features
+
+### Enable and Disable ButtonGroup
+
+You can configure the ButtonGroup to be initially disabled by using its `enable` property. The ButtonGroup can also be disabled or enabled at any time with JavaScript by using the `enable()` method with a Boolean argument.
+
+The following example demonstrates how to enable and disable the ButtonGroup.
+
+###### Example
+
+    $disabledButtonGroup = new \Kendo\UI\ButtonGroup('disabledButton');
+    $disabledButtonGroup->attr('type', 'buttongroup')
+               ->enable(false)
+               ->content('Disabled buttongroup');
+
+    echo $disabledButtonGroup->render();
+
+For more information on the [`enable` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-enable), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
+
+### Index
+
+The initially selected index of the ButtonGroup can be configured by using its `index` property. An index can also be selected over the `select()` method with an Integer argument.
+
+The following example demonstrates how to select a button by its index.
+
+    $buttonGroup = new \Kendo\UI\ButtonGroup('select-period');
+    $month = new \Kendo\UI\ButtonGroupItem();
+    $month->text("Month");
+    $quarter = new \Kendo\UI\ButtonGroupItem();
+    $quarter->text("Quarter");
+    $year = new \Kendo\UI\ButtonGroupItem();
+    $year->text("Year");
+
+    $buttonGroup->addItem($month, $quarter, $year);
+    $buttonGroup->select(0);
+
+    echo $buttonGroup->render();
+
+For more information on the [`select` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-select), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
+
+## Reference
+
+### Existing Instances
+
+To reference an existing ButtonGroup instance, refer to the [introductory article on the ButtonGroup]({% slug overview_kendoui_buttongroup_widget %}#reference).
+
+## See Also
+
+Other articles on Telerik UI for PHP and on the ButtonGroup:
+
+* [Overview of the Kendo UI ButtonGroup Widget]({% slug overview_kendoui_buttongroup_widget %})
+* [Telerik UI for PHP API Reference Folder](/api/php/Kendo/UI/AutoComplete)
+* [Telerik UI for PHP Classes Folder]({% slug overview_autocomplete_uiforphp %})
diff --git a/docs/web.config b/docs/web.config
index 1f8606f6ffa..245be71358e 100644
--- a/docs/web.config
+++ b/docs/web.config
@@ -219,11 +219,10 @@
                   <action type="Redirect" url="api/javascript/ui/grid/configuration/pdf.margin#pdf.margin.{R:1}" />
                 </rule>
 
-{% for api_group in site.api %}
+{% for api_group in site.api %}{% if api_group.skip_redirect == true %}{% continue %}{% else %}
 {%  for group_parent in api_group.group_parents %}
-<rule name="api-redirect-{{ group_parent | replace: '.', '-' }}" enabled="true"><match url="^{{ api_group.file }}/configuration/{{ group_parent }}.(.*)$" /><action type="Redirect" url="{{ api_group.file }}/configuration/{{ group_parent }}" /></rule>
-{%  endfor %}
-{% endfor %}
+<rule name="api-redirect-{{ api_group.file | replace: '/', '-' }}-{{ group_parent | replace: '.', '-' }}" enabled="true"><match url="^{{ api_group.file }}/configuration/{{ group_parent }}.(.*)$" /><action type="Redirect" url="{{ api_group.file }}/configuration/{{ group_parent }}" /></rule>
+{% endfor %}{% endif %}{% endfor %}
 
 {% for directory in site.redirect_directories %}
 <rule name="redirect-directory-{{ directory.path | replace: '/', '-' }}" enabled="true"><match url="^{{ directory.path }}/?$" /><conditions logicalGrouping="MatchAll"><add input="{REQUEST_FILENAME}.html" matchType="IsFile" negate="true" /></conditions><action type="Redirect" url="{{ directory.url }}" redirectType="Found" /></rule>
diff --git a/styles/web/common/button.less b/styles/web/common/button.less
index 7c7f2325c17..9ff3aba1074 100644
--- a/styles/web/common/button.less
+++ b/styles/web/common/button.less
@@ -248,7 +248,17 @@ input[type="reset"].k-button-expand {
     .k-button {
         float: left;
     }
+
+    &.k-dialog-buttongroup .k-button {
+        float: right;
+    }
 }
-.k-ie9 .k-rtl .k-button-group .k-button {
-    float: right;
+.k-ie9 .k-rtl .k-button-group {
+    .k-button {
+        float: right;
+    }
+
+    &.k-dialog-buttongroup .k-button {
+        float: left;
+    }
 }
\ No newline at end of file
diff --git a/styles/web/common/toolbar.less b/styles/web/common/toolbar.less
index 27a3ea2eda8..11936ac25f2 100644
--- a/styles/web/common/toolbar.less
+++ b/styles/web/common/toolbar.less
@@ -4,6 +4,7 @@
     display: block;
     vertical-align: middle;
     padding: 0.28571428em 0;
+    overflow: hidden;
 }
 
 .k-toolbar .k-button .k-sprite,
diff --git a/styles/web/type-material.less b/styles/web/type-material.less
index a9f3cb30bde..bf2b152c7a8 100644
--- a/styles/web/type-material.less
+++ b/styles/web/type-material.less
@@ -4051,7 +4051,7 @@ div.k-scheduler-marquee:after {
             border-color: @panelbar-items-border;
         }
 
-        &.k-state-active,
+        &:active,
         &.k-state-border-down {
             color: @button-active-text-color;
             background-color: @button-active-background;