diff --git a/phing/tasks/setup.xml b/phing/tasks/setup.xml
index d9fa8ceee..d305d6af9 100644
--- a/phing/tasks/setup.xml
+++ b/phing/tasks/setup.xml
@@ -263,16 +263,23 @@
     <drush command="config-import" assume="yes" alias="${drush.alias}">
       <option name="partial"></option>
     </drush>
-    <!-- Enable features module. -->
-    <drush command="en" assume="yes" alias="${drush.alias}">
-      <param>features</param>
-    </drush>
-    <!-- Clear drush caches to register features drush commands. -->
-    <drush command="cc" assume="yes" alias="${drush.alias}">
-      <param>drush</param>
-    </drush>
-    <!-- Revert all features. -->
-    <drush command="fra" assume="yes" alias="${drush.alias}"/>
+    <if>
+      <isset property="cm.features.bundle"/>
+      <then>
+        <!-- Enable features module. -->
+        <drush command="en" assume="yes" alias="${drush.alias}">
+          <param>features</param>
+        </drush>
+        <!-- Clear drush caches to register features drush commands. -->
+        <drush command="cc" assume="yes" alias="${drush.alias}">
+          <param>drush</param>
+        </drush>
+        <!-- Revert all features. -->
+        <drush command="fra" assume="yes" alias="${drush.alias}">
+          <option name="bundle">${cm.features.bundle}</option>
+        </drush>
+      </then>
+    </if>
     <!-- Rebuild caches. -->
     <drush command="cr" alias="${drush.alias}"/>
   </target>
diff --git a/template/composer.json b/template/composer.json
index 52dd89093..4f1a6fd75 100644
--- a/template/composer.json
+++ b/template/composer.json
@@ -15,6 +15,7 @@
     "drupal/cog":                                 "~8",
     "drupal/console":                             "1.0.0-beta5",
     "drupal/core":                                "~8",
+    "drupal/features":                            "~8.3.0-beta9",
     "drupal/lightning":                           "~8",
     "drupal/memcache" :                           "8.*",
     "drupal/search_api":                          "8.1.0-alpha14",
@@ -56,6 +57,9 @@
     "patches": {
       "drupal/core": {
         "Ignore front end vendor folders to improve directory search performance": "https://www.drupal.org/files/issues/ignore_front_end_vendor-2329453-116.patch"
+      },
+      "drupal/features": {
+        "Bundle support": "https://www.drupal.org/files/issues/features-2808303-2.patch"
       }
     }
   },
diff --git a/template/project.yml b/template/project.yml
index 201e11427..e038f1b96 100644
--- a/template/project.yml
+++ b/template/project.yml
@@ -58,6 +58,11 @@ target-hooks:
     dir: ${docroot}/profiles/contrib/lightning
     command: npm run install-libraries
 
+# Configuration management options, such as core CM or features.
+# cm:
+#   features:
+#     bundle: blted8
+
 # Define any custom Phing files that you'd like to import. E.g., ${repo.root}/blt/phing/build.xml
 import: ~