diff --git a/build-varbase.make b/build-varbase.make
index c32e5573961e32c984d3c088b2d8f45f5a486acf..9352090b216e25fa7f7d64397bcc0aed487a0ca3 100644
--- a/build-varbase.make
+++ b/build-varbase.make
@@ -1,5 +1,7 @@
-core = 8.x
 api = 2
-
+core = 8.x
 includes[] = drupal-org-core.make
-includes[] = drupal-org.make
+projects[varbase][type] = profile
+projects[varbase][download][type] = git
+projects[varbase][download][branch] = 8.x-4.x
+projects[varbase][download][tag] = 8.x-4.x-dev
diff --git a/composer.json b/composer.json
index 5669dff6b0d07d99aac1c1746ec67c329456009c..521c337759ef8e66c8b1bdedf96d0ecf4aefff50 100644
--- a/composer.json
+++ b/composer.json
@@ -107,6 +107,10 @@
       ]
     },
     "patches": {
+      "drupal/core": {
+        "Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order":
+        "https://www.drupal.org/files/issues/1356276-303.patch"
+      },
       "drupal/bootstrap_layouts": {
         "Issue #2868095 by RajabNatshah: Fix for the issue of not having plugin.manager.core.layout on update.":
         "https://www.drupal.org/files/issues/2868095-2.patch"
@@ -196,7 +200,6 @@
     "drupal/fast_404": "1.0-alpha2",
     "drupal/diff": "1.0-rc1",
     "drupal/masquerade": "2.0-beta1",
-    "drupal/libraries": "3.x-dev#08a46ab12b573f1f48e9d160ed21a36417b5f749",
     "drupal/libraries_ui": "1.0",
     "drupal/devel": "1.0-rc1",
     "drupal/bootstrap": "3.3",
@@ -213,6 +216,7 @@
     "drupal/recaptcha": "2.2",
     "drupal/mailsystem": "4.1",
     "drupal/smtp": "1.0-beta2",
+    "drupal/libraries": "3.x-dev#061ead081c92a6209b09eaf23b4e3103f360946e",
     "drupal/layout_plugin": "1.0-alpha23",
     "drupal/xmlsitemap": "1.0-alpha2",
     "drupal/anchor_link": "1.3",
diff --git a/drupal-org-core.make b/drupal-org-core.make
index e591a4be95cbcd644ccc30210043417db11e3c6c..1f373be51b592da06838bb92f036dbe302d59b84 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -1,8 +1,10 @@
-core = 8.x
 api = 2
+core = 8.x
 
 ; Drupal Core
 projects[drupal][type] = "core"
 projects[drupal][version] = "8.3.0"
+;; Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order 
+projects[drupal][patch][] = https://www.drupal.org/files/issues/1356276-303.patch
 ;; Issue #2853988: Add option to rewrite robots.txt on staging environments
 projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_stg_robots-2853988-2.patch
diff --git a/drupal-org.make b/drupal-org.make
index 24c004f9df0e88871a2b475c9e8c55fc405e7cd8..ece538640aaaca93558cd5a4bdb16e95e5942b3f 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -1,5 +1,5 @@
-core = 8.x
 api = 2
+core = 8.x
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Contrib modules
@@ -323,12 +323,6 @@ projects[masquerade][type] = module
 projects[masquerade][subdir] = "contrib"
 projects[masquerade][version] = 2.0-beta1
 
-projects[libraries][type] = module
-projects[libraries][subdir] = "contrib"
-projects[libraries][download][url] = https://git.drupal.org/project/libraries.git
-projects[libraries][download][revision] = 08a46ab12b573f1f48e9d160ed21a36417b5f749
-projects[libraries][download][branch] = 8.x-3.x
-
 projects[libraries_ui][type] = module
 projects[libraries_ui][subdir] = "contrib"
 projects[libraries_ui][version] = 1.0
@@ -355,6 +349,12 @@ projects[adminimal_theme][version] = 1.3
 ;;  - As a step to update or migrate and use new selected modules. 
 ;;;;;;;;;;;;;;;;;;;;;
 
+projects[libraries][type] = module
+projects[libraries][subdir] = "contrib"
+projects[libraries][download][url] = https://git.drupal.org/project/libraries.git
+projects[libraries][download][revision] = 061ead081c92a6209b09eaf23b4e3103f360946e
+projects[libraries][download][branch] = 8.x-3.x
+
 ;; Layout plugin is in Drupal 8.3.x core under the name of [Layout Discovery]
 projects[layout_plugin][type] = module
 projects[layout_plugin][subdir] = "contrib"
diff --git a/varbase.info.yml b/varbase.info.yml
index 5dbe537cd35bd746745d3a7c639c413cbf2b2c0a..d86fc5d71da6d2fe1bc6cd889872044779a3cd2b 100644
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -48,7 +48,6 @@ dependencies:
 
   # contrib modules
   - entity
-  - libraries
   - config_update
   - ctools
   - ctools_block