diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e59d8cd63e5e5e35a987a08ebc078b35402a39..14a6dfbe02d021f6ec8ea5ca231231dd9c26c349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,85 @@
+## 8.4.17
+
+### Highlighted important changes since Varbase 8.4.16:
+* Issue [#2950672](https://www.drupal.org/node/2950672):
+                  Updated [Drupal core] from 8.4.5 to 8.5.0
+
+Only updated [Drupal core] from 8.4.5 to 8.5.0
+Keeping the use of media_entity module Varbase 8.x-4.x 
+Planned to have Varbase 8.x-5.x which planned to use the media module
+ in Drupal 8.5.x core.
+
+### Added since Varbase 8.4.16:
+* Issue [#2953394](https://www.drupal.org/node/2953394):
+                  Added custom [media html twig] template file with
+                  no contextual links to [Vartheme Admin]
+                  and [Vartheme Material Admin] administration themes.
+* Issue [#2953398](https://www.drupal.org/node/2953398):
+                  Added custom [media html twig] template file with
+                  no contextual links to [Vartheme] front-end theme.
+* Issue [#2953411](https://www.drupal.org/node/2953411):
+                  Added custom [media html twig] template file with
+                  no contextual links to [Vartheme Material] front-end theme.
+
+### Changed since Varbase 8.4.16:
+* Issue [#2954204](https://www.drupal.org/node/2954204):
+                  Changed twig template files extension in [VARTHEME_SUBTHEM]
+                  so we do not end up loading theme with [Vartheme] after
+                  the new update of TWIG engine in Drupal 8.5.0
+* Issue [#2954210](https://www.drupal.org/node/2954210):
+                  Changed twig template files extension in
+                  [VARTHEME_MATERIAL_SUBTHEM] so we do not end up loading
+                  theme with [Vartheme Material] after the new update of
+                  TWIG engine in Drupal 8.5.0
+
+### Updates since Varbase 8.4.16
+* Issue [#2950672](https://www.drupal.org/node/2950672):
+                  Updated [Drupal core] from 8.4.5 to 8.5.0
+* Issue [#2953276](https://www.drupal.org/node/2953276):
+                  Updated [Bootstrap] theme from 8.3.10 to 8.3.11
+* Issue [#2954241](https://www.drupal.org/node/2954241):
+                  Updated [Vartheme] theme from 8.4.16 to 8.4.17
+* Issue [#2954243](https://www.drupal.org/node/2954243):
+                  Updated [Vartheme Material] theme
+                  from 8.4.0-alpha1 to 8.4.0-alpha2
+* Issue [#2951948](https://www.drupal.org/node/2951948):
+                  Updated [Views Bulk Operations (VBO)] module
+                  from 8.2.0 to 8.2.1
+* Issue [#2951949](https://www.drupal.org/node/2951949):
+                  Updated [Material Admin] theme
+                  from 8.1.0-alpha5 to 8.1.0-alpha6
+* Issue [#2951950](https://www.drupal.org/node/2951950):
+                  Updated [Content locking (anti-concurrent editing)] module
+                  from 8.1.0-alpha7 to 8.1.0-alpha8
+* Issue [#2951953](https://www.drupal.org/node/2951953):
+                  Updated [Charts] module from 8.3.0-alpha7 to 8.3.0-alpha8
+* Issue [#2953232](https://www.drupal.org/node/2953232):
+                  Updated [Entity API] module from 8.1.0-beta1 to 8.1.0-beta3
+* Issue [#2953236](https://www.drupal.org/node/2953236):
+                  Updated [Redirect] module from 8.1.0 to 8.1.1
+* Issue [#2953240](https://www.drupal.org/node/2953240):
+                  Updated [Schema.org Metatag] module from 8.1.0 to 8.1.1
+* Issue [#2953248](https://www.drupal.org/node/2953248):
+                  Updated [Views Bulk Edit] module
+                  from 8.2.0-beta4 to 8.2.0-rc1
+* Issue [#2953254](https://www.drupal.org/node/2953254):
+                  Updated [Webform] module from 8.5.0-rc3 to 8.5.0-rc5
+                  - And removed [contribute] module
+* Issue [#2954170](https://www.drupal.org/node/2954170):
+                  Updated [Webform] module from 8.5.0-rc5 to 8.5.0-rc6
+* Issue [#2954167](https://www.drupal.org/node/2954167):
+                  Updated [reCAPTCHA] module from 8.2.2 to 8.2.3
+
+### Fixes since Varbase 8.4.16:
+* Issue [#2953415](https://www.drupal.org/node/2953415):
+                  Fixed wrong RTL file name for VARTHEME_MATERIAL_SUBTHEME
+                  in the [Vartheme Material] theme.
+* Issue [#2900926](https://www.drupal.org/node/2900926):
+                  Fixed issues on the Vartheme sub theme generator scripts
+                  for a project using command line works for RTL option but
+                  does not for LTR.
+
+
 ## 8.4.16
 
 ### Highlighted important changes since Varbase 8.4.15:
@@ -197,7 +279,7 @@
                   from 8.2.0-alpha2 to 8.2.0-beta1
 * Issue [#2947878](https://www.drupal.org/node/2947878):
                   Updated [Search API] module from 8.1.6 to 8.1.7
-* Issue [#2949958](https://www.drupal.org/node/2949958
+* Issue [#2949958](https://www.drupal.org/node/2949958):
                   Updated [Focal Point] module from 8.1.0-beta5 to 8.1.0-beta6
 * Issue [#2949960](https://www.drupal.org/node/2949960):
                   Updated [Pathauto] module from 8.1.0 to 8.1.1
diff --git a/README.md b/README.md
index 399b52f5d08188c6106c40df50d940c1a67c2c01..1064a53033d2a0f4e620a5b660ace89fbdb04afd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/Vardot/varbase.svg?branch=8.x-4.16)](https://travis-ci.org/Vardot/varbase/builds/349964392) Varbase 8.4.16
+[![Build Status](https://travis-ci.org/Vardot/varbase.svg?branch=8.x-4.17)](https://travis-ci.org/Vardot/varbase/builds/349964392) Varbase 8.4.17
 
 [![](https://www.drupal.org/files/styles/grid-3/public/project-images/Medium-Logo%20Color%20with%20padding.png)](https://www.drupal.org/project/varbase)
 
@@ -28,7 +28,7 @@ instructions.
 
 To install the most recent stable release of Varbase 8.4.x run this command:
 ```
-composer create-project Vardot/varbase-project:^8.4.16 PROJECT_DIR_NAME --no-interaction
+composer create-project Vardot/varbase-project:^8.4.17 PROJECT_DIR_NAME --no-interaction
 ```
 
 To install the dev version of Varbase 8.4.x run this command:
diff --git a/UPDATE.md b/UPDATE.md
index a57c301dd505c7732b650d1f5c90c1cdbf69a882..301a70f9192f7ad542b2269d5627391627335219 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -15,6 +15,7 @@ developers need to do to update the last release to the new release.
 * https://www.drupal.org/project/varbase/releases/8.x-4.14
 * https://www.drupal.org/project/varbase/releases/8.x-4.15
 * https://www.drupal.org/project/varbase/releases/8.x-4.16
+* https://www.drupal.org/project/varbase/releases/8.x-4.17
 
 
 # 2 - Backups
@@ -87,9 +88,62 @@ while working on the project.
 
 --------------------------------------------------------------------------------
 
+# Updating Varbase 8.4.16 to Varbase 8.4.17
+  If you already did the update of Varbase from 8.4.16 to 8.4.17, this
+  updating to 8.4.16 will be a quick and easy one.
+
+Before any update, please disable the [contribute] module, which the dependency 
+had been removed in [Webform 8.5.0-rc5] module. [Remove Contribute dependency and move Contribute message into Webform module.](https://www.drupal.org/node/2951706)
+
+
+## Updating files with Copy and Paste for Varbase 8.4.16 to Varbase 8.4.17
+```
+  Given that we are at the drupal root folder for varbase
+   When we delete all drupal core folders and files
+    And we copy all new Varbase files drupal root folder for varbase
+    And we make sure that we have all custom module or themes still in the
+        "sites" folder
+    And we make sure that all new used modules and features are present.
+   Then we will be ready to update the active config and database.
+```
+
+## Varbase Procedures to the varbase base code. not in any varbase-project project builders.
+```
+  Given that we are at the root folder for varbase project, not the docroot
+    And we make sure that the current "Varbase-project" composer.json file and
+        files are the latest
+   When we delete the "vendor" folder
+    And we delete the "composer.lock" file
+    And we run the "composer require vardot/varbase:8.4.17" command
+    And wait for composer to finish work
+   Then we should not see any issues in the terminal
+    And we should see "Writing lock file" in the terminal
+    And we should see "Generating autoload files" in the terminal
+   When the composer finishes work with no errors
+   Then we will be ready to update the active config and database.
+```
+
+## Updating the active config and database from Varbase 8.4.16 to Varbase 8.4.17
+```
+  Given that we are in the docroot of the current Varbase project
+    And all files are updated using (copy and past) or (composer require/update
+   When we run drush "updb" or go to "/update.php"
+   Then we should see the steps of updates.
+   When we run drush "updb" or go to "/update.php" again
+   Then we will have the site update with the new Varbase 8.4.17 version
+   When we go to "/admin/config/development/features"
+   Then we should see "Changed"
+   When we follow with each feature to import new changes.
+   Then we will have the Varbase site updated to the latest version.
+```
+
+
+--------------------------------------------------------------------------------
+
+
 
-# Updating Varbase 8.4.15 to Varbase 8.4.6
-  If you already did the update of Varbase from 8.4.15 to 8.4.164, this
+# Updating Varbase 8.4.15 to Varbase 8.4.16
+  If you already did the update of Varbase from 8.4.15 to 8.4.16, this
   updating to 8.4.16 will be a quick and easy one.
 
 ## Updating files with Copy and Paste for Varbase 8.4.15 to Varbase 8.4.16
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.info.yml b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
index 0472c806f533bbb9d6f38971cd48b06a0bfb6e75..59e34a9d6342a792ccd4c45068f2077802149208 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.info.yml
+++ b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
@@ -19,6 +19,6 @@ dependencies:
   - views
   - views_bulk_edit
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_core/varbase_core.info.yml b/modules/varbase_features/varbase_core/varbase_core.info.yml
index efbef7aa0a66ef19849b96416d4bcdc3b3732f85..2da4b24dcc081bf57768126e2ff55b3c7c4a068a 100644
--- a/modules/varbase_features/varbase_core/varbase_core.info.yml
+++ b/modules/varbase_features/varbase_core/varbase_core.info.yml
@@ -16,6 +16,6 @@ dependencies:
   - node
   - taxonomy
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
index 5e6bd93a2da8f2e38e2cd1286225667ac398a5bf..092364b9f6df907fcea00690c53fd639b4bb0026 100644
--- a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
+++ b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
@@ -5,6 +5,6 @@ description: 'Varbase default content'
 dependencies:
   - default_content
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_development/varbase_development.info.yml b/modules/varbase_features/varbase_development/varbase_development.info.yml
index e77c664c744429c0334fca1311a0421960fe5617..7a67d1933b3c430795d92e1eee3e516f33e029f1 100644
--- a/modules/varbase_features/varbase_development/varbase_development.info.yml
+++ b/modules/varbase_features/varbase_development/varbase_development.info.yml
@@ -11,6 +11,6 @@ dependencies:
   - tour_ui
   - tour_builder
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml b/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
index 1662d329f360efad6cebd7065cc7c992f1d39184..c51243c75f7565eeda4d96927776d415fc6417ef 100644
--- a/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
+++ b/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
@@ -8,6 +8,6 @@ dependencies:
   - locale
   - l10n_client_ui
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_landing/varbase_landing.info.yml b/modules/varbase_features/varbase_landing/varbase_landing.info.yml
index 384c10c2197d303802f4dd181fc1d83e5b5d04b0..9cd5ce683ebb1b7404afd45cd2a592a8cdff2246 100755
--- a/modules/varbase_features/varbase_landing/varbase_landing.info.yml
+++ b/modules/varbase_features/varbase_landing/varbase_landing.info.yml
@@ -26,6 +26,6 @@ dependencies:
   - viewsreference
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_media/varbase_media.info.yml b/modules/varbase_features/varbase_media/varbase_media.info.yml
index c3aa88f534780011cc01fff2df97c1b449b167e2..a96fd6c3fa4d29e043963dfa62ca36bbfedfca69 100644
--- a/modules/varbase_features/varbase_media/varbase_media.info.yml
+++ b/modules/varbase_features/varbase_media/varbase_media.info.yml
@@ -30,6 +30,6 @@ dependencies:
   - video_embed_media
   - views
   - views_infinite_scroll
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_page/varbase_page.info.yml b/modules/varbase_features/varbase_page/varbase_page.info.yml
index e653557360de327e5395145cb4c8a6a128e27b6b..0a700c317ab2ff1681d662c1d9804ec7463fb674 100644
--- a/modules/varbase_features/varbase_page/varbase_page.info.yml
+++ b/modules/varbase_features/varbase_page/varbase_page.info.yml
@@ -20,6 +20,6 @@ dependencies:
   - varbase_seo
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_search/varbase_search.info.yml b/modules/varbase_features/varbase_search/varbase_search.info.yml
index f01e359be10f267a5bfd56357f2a474b1d39cb20..9c9f40e8cbc0b1803e108a3b046a0a797a1e5b36 100644
--- a/modules/varbase_features/varbase_search/varbase_search.info.yml
+++ b/modules/varbase_features/varbase_search/varbase_search.info.yml
@@ -2,7 +2,7 @@ name: 'Varbase Search'
 description: 'Provides search configuration, and offering search capabilities.'
 type: module
 core: 8.x
-version: 8.x-4.x-dev
+version: 8.x-4.17
 package: Varbase
 dependencies:
   - better_exposed_filters
diff --git a/modules/varbase_features/varbase_security/varbase_security.info.yml b/modules/varbase_features/varbase_security/varbase_security.info.yml
index 4d9c1b57e14f4168065a27b77c660689983f0f49..2ae4ed5d30c81a899184a9828d8be05729e126f7 100644
--- a/modules/varbase_features/varbase_security/varbase_security.info.yml
+++ b/modules/varbase_features/varbase_security/varbase_security.info.yml
@@ -17,6 +17,6 @@ dependencies:
   - user
   - username_enumeration_prevention
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_seo/varbase_seo.info.yml b/modules/varbase_features/varbase_seo/varbase_seo.info.yml
index 7e0dce26a601176c5f4429df9b07f640db53ee0e..1ec0d1a102f9ba33e9ecd589b4f932bd6ed49fb4 100644
--- a/modules/varbase_features/varbase_seo/varbase_seo.info.yml
+++ b/modules/varbase_features/varbase_seo/varbase_seo.info.yml
@@ -26,6 +26,6 @@ dependencies:
   - user
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_tour/varbase_tour.info.yml b/modules/varbase_features/varbase_tour/varbase_tour.info.yml
index 4a9334ef98efe36ac97ed2e2aa3b0f3ba0c7a31e..89b22eb2525a20e0c3c049b0e1c0e6756dc1ce8e 100644
--- a/modules/varbase_features/varbase_tour/varbase_tour.info.yml
+++ b/modules/varbase_features/varbase_tour/varbase_tour.info.yml
@@ -4,6 +4,6 @@ type: module
 dependencies:
   - tour
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_webform/varbase_webform.info.yml b/modules/varbase_features/varbase_webform/varbase_webform.info.yml
index 7f528bc6be679a91c0c5ccb8f8adaaeb3f9a8663..5ed33a30aa456886efbf94ac278cb05152cdfd75 100644
--- a/modules/varbase_features/varbase_webform/varbase_webform.info.yml
+++ b/modules/varbase_features/varbase_webform/varbase_webform.info.yml
@@ -9,6 +9,6 @@ dependencies:
   - webform_ui
   - webform_bootstrap
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-4.17
 core: 8.x
 project: varbase
diff --git a/varbase.info.yml b/varbase.info.yml
index c17e2c76e72e3519a02e762178d8fb9c8398b7dc..0cd5673bfae5e8722eba1ea48633d4207356fc33 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -6,7 +6,7 @@ distribution:
   name: Varbase
   install:
     theme: vartheme_admin
-version: 8.x-4.x-dev
+version: 8.x-4.17
 dependencies:
   # core
   - automated_cron