diff --git a/CHANGELOG.md b/CHANGELOG.md
index b318fc768790..a58f812eea6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.20.10](https://github.com/SAP/ui5-webcomponents/compare/v0.21.9...v0.21.10) (2020-07-29)
+# [0.21.11](https://github.com/SAP/ui5-webcomponents/compare/v0.21.10...v0.21.11) (2020-08-10)
+
+
+### Fixes
+
+* **ui5-li:** scale image properly ([#2059](https://github.com/SAP/ui5-webcomponents/pull/2059))
+([3aadc0e](https://github.com/SAP/ui5-webcomponents/commit/3aadc0e))
+
+* **ui5-tabcontainer:** fix ARIA posinset and setsize values ([#2046](https://github.com/SAP/ui5-webcomponents/issues/2046))
+([c6fcf69](https://github.com/SAP/ui5-webcomponents/commit/c6fcf69))
+
+* **ui5-tabcontainer:** implement ACC for overflowed items ([#2047](https://github.com/SAP/ui5-webcomponents/issues/2047))
+([efe03bc](https://github.com/SAP/ui5-webcomponents/commit/efe03bc))
+
+### Features
+* **tools:** process HBS files in nested directories ([#2067](https://github.com/SAP/ui5-webcomponents/issues/2067))
+([13f1d2a](https://github.com/SAP/ui5-webcomponents/commit/13f1d2a))
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [0.21.10](https://github.com/SAP/ui5-webcomponents/compare/v0.21.9...v0.21.10) (2020-07-29)
 
 
 ### Fixes
diff --git a/packages/base/package.json b/packages/base/package.json
index a3fd532a735a..84527092725a 100644
--- a/packages/base/package.json
+++ b/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-base",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.base",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "url-search-params-polyfill": "^5.0.0"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest",
     "array-uniq": "^2.0.0",
     "copy-and-watch": "^0.1.4",
diff --git a/packages/fiori/package.json b/packages/fiori/package.json
index f8895e63f569..9a4e16cec3db 100644
--- a/packages/fiori/package.json
+++ b/packages/fiori/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-fiori",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.fiori",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -27,13 +27,13 @@
     "directory": "packages/fiori"
   },
   "dependencies": {
-    "@ui5/webcomponents": "0.21.10",
-    "@ui5/webcomponents-base": "0.21.10",
-    "@ui5/webcomponents-icons": "0.21.10",
-    "@ui5/webcomponents-theme-base": "0.21.10"
+    "@ui5/webcomponents": "0.21.11",
+    "@ui5/webcomponents-base": "0.21.11",
+    "@ui5/webcomponents-icons": "0.21.11",
+    "@ui5/webcomponents-theme-base": "0.21.11"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest"
   }
 }
\ No newline at end of file
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 4cb9cfe601ef..ca30c7245322 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-icons",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.SAP-icons",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "directory": "packages/icons"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.21.10"
+    "@ui5/webcomponents-base": "0.21.11"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest"
   }
 }
\ No newline at end of file
diff --git a/packages/localization/package.json b/packages/localization/package.json
index e129fb302b19..e28e6235422d 100644
--- a/packages/localization/package.json
+++ b/packages/localization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@buxlabs/amd-to-es6": "^0.15.0",
     "@openui5/sap.ui.core": "1.76.0",
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest",
     "copy-and-watch": "^0.1.4",
     "escodegen": "^1.11.0",
@@ -36,6 +36,6 @@
     "rimraf": "^2.6.2"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.21.10"
+    "@ui5/webcomponents-base": "0.21.11"
   }
 }
\ No newline at end of file
diff --git a/packages/main/package.json b/packages/main/package.json
index 75d80724e4ee..5f5aa762cad7 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.main",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -27,13 +27,13 @@
     "directory": "packages/main"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.21.10",
-    "@ui5/webcomponents-icons": "0.21.10",
-    "@ui5/webcomponents-localization": "0.21.10",
-    "@ui5/webcomponents-theme-base": "0.21.10"
+    "@ui5/webcomponents-base": "0.21.11",
+    "@ui5/webcomponents-icons": "0.21.11",
+    "@ui5/webcomponents-localization": "0.21.11",
+    "@ui5/webcomponents-theme-base": "0.21.11"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest"
   }
 }
\ No newline at end of file
diff --git a/packages/theme-base/package.json b/packages/theme-base/package.json
index 7628bde40362..bf652acc9bc1 100644
--- a/packages/theme-base/package.json
+++ b/packages/theme-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-theme-base",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.theme-base",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -24,10 +24,10 @@
   },
   "dependencies": {
     "@sap-theming/theming-base-content": "11.1.19",
-    "@ui5/webcomponents-base": "0.21.10"
+    "@ui5/webcomponents-base": "0.21.11"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.21.10",
+    "@ui5/webcomponents-tools": "0.21.11",
     "chromedriver": "latest",
     "chokidar-cli": "^2.0.0",
     "copy-and-watch": "^0.1.4",
diff --git a/packages/tools/package.json b/packages/tools/package.json
index d161e5a754c8..5d5de3dcade1 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-tools",
-  "version": "0.21.10",
+  "version": "0.21.11",
   "description": "UI5 Web Components: webcomponents.tools",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",