diff --git a/commons.api.php b/commons.api.php
index f137568d238ab47e2b503769d0df77bd2422af98..fd87fa51abce67a8cfd66cd38a5fbf3d36d5ddd7 100644
--- a/commons.api.php
+++ b/commons.api.php
@@ -35,12 +35,23 @@ function hook_commons_entity_integration() {
     'webform' => array(
       'test' => array(
         'exclude_rate' => TRUE,
+        'is_group_content' => FALSE,
       ),
       'survey' => array(
+        'is_group_content' => TRUE,
         'exclude_topics' => TRUE,
       ),
       'suggestion' => array(
         'media' => TRUE,
+        'is_group_content' => TRUE,
+        'exclude_commons_follow' => TRUE,
+      ),
+    ),
+    'node' => array(
+      'group' => array(
+        'is_group_content' => FALSE,
+        'is_group' => TRUE,
+        'exclude_commons_follow' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_documents/commons_documents.module b/modules/commons/commons_documents/commons_documents.module
index de94e877969a6cf7ff45329adece2bd081007606..ec586e22ea8fb2a17b3876d48ad8a02fb2ab806d 100644
--- a/modules/commons/commons_documents/commons_documents.module
+++ b/modules/commons/commons_documents/commons_documents.module
@@ -91,6 +91,7 @@ function commons_documents_commons_entity_integration() {
   return array(
     'node' => array(
       'document' => array(
+        'is_group_content' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_events/commons_events.module b/modules/commons/commons_events/commons_events.module
index e6b28deadb655a075dc383bf83fddacf717a8f9a..177d48455d7a68e34b06ac85acda61ca9031fff0 100644
--- a/modules/commons/commons_events/commons_events.module
+++ b/modules/commons/commons_events/commons_events.module
@@ -290,6 +290,7 @@ function commons_events_commons_entity_integration() {
   return array(
     'node' => array(
       'event' => array(
+        'is_group_content' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_groups/commons_groups.features.field_instance.inc b/modules/commons/commons_groups/commons_groups.features.field_instance.inc
index 54ac03354e65be332125a48d831417ef4792cd7d..0144c87cb839e5b9734dbe92cc30c5cb5ca7d478 100644
--- a/modules/commons/commons_groups/commons_groups.features.field_instance.inc
+++ b/modules/commons/commons_groups/commons_groups.features.field_instance.inc
@@ -19,6 +19,7 @@ function commons_groups_field_default_field_instances() {
     }
   }
   $group_bundles = og_get_all_group_bundle();
+
   if (empty($group_bundles['node'])) {
     // Make sure group_bundles contains at least the group node bundle, in order
     // to create the group audience field for it when installing the profile.
@@ -365,7 +366,7 @@ function commons_groups_field_definition_group(&$field_instances, $entity_type,
 
   // Exported field_instance: 'node-group-field_group_logo'
   $field_instances["$entity_type-$bundle-field_group_logo"] = array(
-    'bundle' => 'group',
+    'bundle' => $bundle,
     'deleted' => '0',
     'description' => '',
     'display' => array(
@@ -416,7 +417,7 @@ function commons_groups_field_definition_group(&$field_instances, $entity_type,
 
 function commons_groups_field_definition(&$field_instances, $entity_type, $bundle) {
   // Exported field_instance: 'node-post-og_group_ref'
-   $field_instances["$entity_type-$bundle-og_group_ref"] = array(
+  $field_instances["$entity_type-$bundle-og_group_ref"] = array(
     'bundle' => $bundle,
     'default_value' => NULL,
     'default_value_function' => 'commons_groups_entityreference_default_value',
diff --git a/modules/commons/commons_groups/commons_groups.features.user_permission.inc b/modules/commons/commons_groups/commons_groups.features.user_permission.inc
index 9fb3e9901e3c070f8e68add896c8dc50480d1221..45dcd882102ce1a00eef4a401e79b37a291e8a57 100644
--- a/modules/commons/commons_groups/commons_groups.features.user_permission.inc
+++ b/modules/commons/commons_groups/commons_groups.features.user_permission.inc
@@ -10,25 +10,31 @@
 function commons_groups_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: 'create group content'.
-  $permissions['create group content'] = array(
-    'name' => 'create group content',
-    'roles' => array(
-      'administrator' => 'administrator',
-      'authenticated user' => 'authenticated user',
-    ),
-    'module' => 'node',
-  );
+  $groups = commons_groups_get_groups();
 
-  // Exported permission: 'edit own group content'.
-  $permissions['edit own group content'] = array(
-    'name' => 'edit own group content',
-    'roles' => array(
-      'administrator' => 'administrator',
-      'authenticated user' => 'authenticated user',
-    ),
-    'module' => 'node',
-  );
+  if (isset($groups['node'])) {
+    foreach ($groups['node'] as $bundle => $group_info) {
+      // Exported permission: 'create group content'.
+      $permissions["create $bundle content"] = array(
+        'name' => "create $bundle content",
+        'roles' => array(
+          'administrator' => 'administrator',
+          'authenticated user' => 'authenticated user',
+        ),
+        'module' => 'node',
+      );
+
+      // Exported permission: 'edit own group content'.
+      $permissions["edit own $bundle content"] = array(
+        'name' => "edit own $bundle content",
+        'roles' => array(
+          'administrator' => 'administrator',
+          'authenticated user' => 'authenticated user',
+        ),
+        'module' => 'node',
+      );
+    }
+  }
 
   return $permissions;
 }
diff --git a/modules/commons/commons_groups/commons_groups.module b/modules/commons/commons_groups/commons_groups.module
index d2d5447672500316817304aa1e0f5d678cc4e5ea..5a34bcb14782b01a3a9ab7558ac730759ec072c7 100644
--- a/modules/commons/commons_groups/commons_groups.module
+++ b/modules/commons/commons_groups/commons_groups.module
@@ -92,29 +92,33 @@ function commons_groups_entity_view($entity, $type, $view_mode, $langcode) {
  *
  * Alter the privacy settings fields.
  */
-function commons_groups_form_group_node_form_alter(&$form, &$form_state) {
-  // The group privacy settings are not required.
-  $form['field_og_subscribe_settings'][LANGUAGE_NONE]['#required'] = FALSE;
-
-  if (module_exists('og_access')) {
-    // Display private content checkbox only when "Joining requires approval"
-    // is selected.
-    $form['field_og_access_default_value']['#states'] = array(
-      'visible' => array(
-        ':input[name="field_og_subscribe_settings[' . LANGUAGE_NONE . ']"]' => array('value' => 'approval'),
-      ),
+function commons_groups_form_node_form_alter(&$form, &$form_state) {
+  $groups = og_get_all_group_bundle();
+
+  if (isset($groups['node']) && in_array($form_state['node']->type, array_keys($groups['node']))) {
+    // The group privacy settings are not required.
+    $form['field_og_subscribe_settings'][LANGUAGE_NONE]['#required'] = FALSE;
+
+    if (module_exists('og_access')) {
+      // Display private content checkbox only when "Joining requires approval"
+      // is selected.
+      $form['field_og_access_default_value']['#states'] = array(
+        'visible' => array(
+          ':input[name="field_og_subscribe_settings[' . LANGUAGE_NONE . ']"]' => array('value' => 'approval'),
+        ),
+      );
+
+      $form['#after_build'] = array('commons_groups_form_group_node_after_build');
+    }
+
+    $form['#attached']['css'] = array(
+      drupal_get_path('module', 'commons_groups') . '/css/commons_groups.css',
     );
 
-    $form['#after_build'] = array('commons_groups_form_group_node_after_build');
+    // The group access is set on commons_groups_node_presave().
+    $form['group_access'][LANGUAGE_NONE]['#required'] = FALSE;
+    $form['group_access']['#access'] = FALSE;
   }
-
-  $form['#attached']['css'] = array(
-    drupal_get_path('module', 'commons_groups') . '/css/commons_groups.css',
-  );
-
-  // The group access is set on commons_groups_node_presave().
-  $form['group_access'][LANGUAGE_NONE]['#required'] = FALSE;
-  $form['group_access']['#access'] = FALSE;
 }
 
 /**
@@ -233,7 +237,9 @@ function commons_groups_features_pipe_alter(&$pipe, $data, $export) {
     foreach ($pipe['field_instance'] as $delta => $value) {
       $args = explode('-', $value);
       $field_name = $args[2];
-      if ($field_name == 'og_group_ref') {
+      $excluded_fields = array('og_group_ref', 'field_og_access_default_value',
+        'field_og_subscribe_settings', 'og_roles_permissions', 'group_access', 'field_group_logo', 'group_group', 'body');
+      if (in_array($field_name, $excluded_fields)) {
         unset($pipe['field_instance'][$delta]);
       }
     }
@@ -255,6 +261,7 @@ function commons_groups_commons_entity_integration() {
     'node' => array(
       'group' => array(
         'is_group_content' => FALSE,
+        'is_group' => TRUE,
         'exclude_commons_follow' => TRUE,
       ),
     ),
@@ -412,7 +419,7 @@ function commons_groups_system_info_alter(&$info, $file, $type) {
   // commons_groups_entity_types variable.
   // We must add a corresponding line for each field instance
   // to commons_groups.info so that Features is aware of the instance
-  // and can sucessfully revert the field_instance component back
+  // and can successfully revert the field_instance component back
   // to its default state.
   if ($file->name == 'commons_groups') {
     $group_bundles = og_get_all_group_bundle();
@@ -424,9 +431,12 @@ function commons_groups_system_info_alter(&$info, $file, $type) {
         $info['features']['field_instance'][] = "node-$bundle-field_og_subscribe_settings";
         $info['features']['field_instance'][] = "node-$bundle-og_roles_permissions";
         // These fields are only necessary when og_access.module is enabled.
-        $info['features']['field_instance'][] = "node-$bundle-field_og_access_default_value";
         $info['features']['field_instance'][] = "node-$bundle-group_access";
         $info['features']['field_instance'][] = "node-$bundle-field_group_logo";
+
+        //
+        $info['features']['field_instance'][] = "node-$bundle-body";
+        $info['features']['field_instance'][] = "node-$bundle-group_group";
       }
     }
     $group_content_entity_types = commons_groups_get_group_content_entity_types();
@@ -826,7 +836,28 @@ function commons_groups_get_group_content_entity_types() {
   }
 
   return $commons_entity_integrations;
+}
+
+/*
+ * Returns an array of entity types that are defined as a group
+ */
+function commons_groups_get_groups() {
+  // Find all Commons Entity integrations.
+  $commons_groups = array();
+  $commons_entity_integrations = commons_entity_integration_info();
+  if (empty($commons_entity_integrations)) {
+    return array();
+  }
+
+  foreach ($commons_entity_integrations as $entity_type => $integration) {
+    foreach ($integration as $bundle => $options) {
+      if (isset($options['is_group']) && $options['is_group'] == TRUE) {
+        $commons_groups[$entity_type][$bundle] = $commons_entity_integrations[$entity_type][$bundle];
+      }
+    }
+  }
 
+  return $commons_groups;
 }
 
 /**
diff --git a/modules/commons/commons_groups/commons_groups.strongarm.inc b/modules/commons/commons_groups/commons_groups.strongarm.inc
index c93c04e61560b85fd82ebd7b7307512d1d05baf9..59ceac17577eb8ae29bf4af9449ceec575fd001a 100644
--- a/modules/commons/commons_groups/commons_groups.strongarm.inc
+++ b/modules/commons/commons_groups/commons_groups.strongarm.inc
@@ -9,94 +9,139 @@
  */
 function commons_groups_strongarm() {
   $export = array();
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_anonymous_group';
-  $strongarm->value = 0;
-  $export['comment_anonymous_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_mode_group';
-  $strongarm->value = 1;
-  $export['comment_default_mode_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_per_page_group';
-  $strongarm->value = '50';
-  $export['comment_default_per_page_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_form_location_group';
-  $strongarm->value = 1;
-  $export['comment_form_location_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_group';
-  $strongarm->value = '0';
-  $export['comment_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_preview_group';
-  $strongarm->value = '1';
-  $export['comment_preview_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_subject_field_group';
-  $strongarm->value = 1;
-  $export['comment_subject_field_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'field_bundle_settings_node__group';
-  $strongarm->value = array(
-    'view_modes' => array(
-      'teaser' => array(
-        'custom_settings' => TRUE,
-      ),
-      'full' => array(
-        'custom_settings' => FALSE,
-      ),
-      'rss' => array(
-        'custom_settings' => FALSE,
-      ),
-      'search_index' => array(
-        'custom_settings' => FALSE,
-      ),
-      'search_result' => array(
-        'custom_settings' => FALSE,
-      ),
-      'diff_standard' => array(
-        'custom_settings' => FALSE,
-      ),
-      'token' => array(
-        'custom_settings' => FALSE,
-      ),
-    ),
-    'extra_fields' => array(
-      'form' => array(
-        'title' => array(
-          'weight' => '-5',
+  $groups = commons_groups_get_groups();
+
+  if (isset($groups['node'])) {
+    foreach ($groups['node'] as $bundle => $group_info) {
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_anonymous_$bundle";
+      $strongarm->value = 0;
+      $export["comment_anonymous_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_default_mode_$bundle";
+      $strongarm->value = 1;
+      $export["comment_default_mode_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_default_per_page_$bundle";
+      $strongarm->value = '50';
+      $export["comment_default_per_page_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_form_location_$bundle";
+      $strongarm->value = 1;
+      $export["comment_form_location_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_$bundle";
+      $strongarm->value = '0';
+      $export["comment_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_preview_$bundle";
+      $strongarm->value = '1';
+      $export["comment_preview_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "comment_subject_field_$bundle";
+      $strongarm->value = 1;
+      $export["comment_subject_field_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "field_bundle_settings_node__$bundle";
+      $strongarm->value = array(
+        'view_modes' => array(
+          'teaser' => array(
+            'custom_settings' => TRUE,
+          ),
+          'full' => array(
+            'custom_settings' => FALSE,
+          ),
+          'rss' => array(
+            'custom_settings' => FALSE,
+          ),
+          'search_index' => array(
+            'custom_settings' => FALSE,
+          ),
+          'search_result' => array(
+            'custom_settings' => FALSE,
+          ),
+          'diff_standard' => array(
+            'custom_settings' => FALSE,
+          ),
+          'token' => array(
+            'custom_settings' => FALSE,
+          ),
         ),
-      ),
-      'display' => array(),
-    ),
-  );
-  $export['field_bundle_settings_node__group'] = $strongarm;
+        'extra_fields' => array(
+          'form' => array(
+            'title' => array(
+              'weight' => '-5',
+            ),
+          ),
+          'display' => array(),
+        ),
+      );
+      $export["field_bundle_settings_node__$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "node_options_$bundle";
+      $strongarm->value = array(
+        0 => 'revision',
+      );
+      $export["node_options_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "node_preview_$bundle";
+      $strongarm->value = '1';
+      $export["node_preview_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "node_submitted_$bundle";
+      $strongarm->value = 0;
+      $export["node_submitted_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "og_group_manager_default_rids_node_$bundle";
+      $strongarm->value = array(
+        3 => '3',
+      );
+      $export["og_group_manager_default_rids_node_$bundle"] = $strongarm;
+
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "pathauto_node_${bundle}_pattern";
+      $strongarm->value = 'groups/[node:title]';
+      $export["pathauto_node_${bundle}_pattern"] = $strongarm;
+    }
+  }
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
@@ -117,45 +162,6 @@ function commons_groups_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'node_options_group';
-  $strongarm->value = array(
-    0 => 'revision',
-  );
-  $export['node_options_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'node_preview_group';
-  $strongarm->value = '1';
-  $export['node_preview_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'node_submitted_group';
-  $strongarm->value = 0;
-  $export['node_submitted_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'og_group_manager_default_rids_node_group';
-  $strongarm->value = array(
-    3 => '3',
-  );
-  $export['og_group_manager_default_rids_node_group'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'pathauto_node_group_pattern';
-  $strongarm->value = 'groups/[node:title]';
-  $export['pathauto_node_group_pattern'] = $strongarm;
-
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
   $strongarm->name = 'pathauto_node_pattern';
   $strongarm->value = 'groups/[node:og-group-ref:0:title]/[node:title]';
   $export['pathauto_node_pattern'] = $strongarm;
diff --git a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.module b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.module
index a3b067527b1aa0c9df4de5d6d384e389072c124d..4f3066643e7f6c07b07a5586c1f48823cf96ecd7 100644
--- a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.module
+++ b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.module
@@ -5,3 +5,72 @@
  */
 
 include_once 'commons_groups_pages.features.inc';
+
+/*
+function commons_groups_pages_panelizer_defaults_override_alter(&$items) {
+  if (isset($items['node:group:default'])) {
+    $group_bundles = og_get_all_group_bundle();
+    if (!empty($group_bundles['node'])) {
+      // Don't alter the group panel.
+      unset($group_bundles['node']['group']);
+      foreach ($group_bundles['node'] as $bundle => $name) {
+        $items["node:$bundle:default"] = clone $items['node:group:default'];
+        $items["node:$bundle:default"]->name = "node:$bundle:default";
+        $items["node:$bundle:default"]->panelizer_key = $bundle;
+        $items["node:$bundle:default"]->display->uuid = ctools_uuid_generate();
+
+        $items["node:$bundle:default:teaser"] = clone $items['node:group:default:teaser'];
+        $items["node:$bundle:default:teaser"]->name = "node:$bundle:default";
+        $items["node:$bundle:default:teaser"]->panelizer_key = $bundle;
+        $items["node:$bundle:default:teaser"]->display->uuid = ctools_uuid_generate();
+      }
+    }
+  }
+}
+*/
+
+/**
+ * Implements hook_system_info_alter().
+ */
+function commons_groups_pages_system_info_alter(&$info, $file, $type) {
+  // Commons Groups dynamically adds the og_group_ref field to
+  // content types that request it by altering the
+  // commons_groups_entity_types variable.
+  // We must add a corresponding line for each field instance
+  // to commons_groups.info so that Features is aware of the instance
+  // and can successfully revert the field_instance component back
+  // to its default state.
+  if ($file->name == 'commons_groups_pages') {
+    $group_bundles = og_get_all_group_bundle();
+    if (!empty($group_bundles['node'])) {
+      foreach ($group_bundles['node'] as $bundle => $name) {
+        // These field instances should be added to groups regardless of
+        // whether og_access.module is enabled.
+        $info['features']['panelizer_defaults'][] = "node:$bundle:default";
+        $info['features']['panelizer_defaults'][] = "node:$bundle:default:teaser";
+        $info['features']['variable'][] = "panelizer_defaults_node_$bundle";
+      }
+    }
+  }
+}
+
+function commons_groups_pages_features_pipe_alter(&$pipe, $data, $export) {
+  // Prevent Commons Groups related fields from being piped in features
+  // when a content type includes those fields.
+  if (!empty($pipe['panelizer_defaults'])) {
+
+    foreach ($pipe['panelizer_defaults'] as $delta => $value) {
+      $args = explode(':', $value);
+      $group_name = $args[1];
+
+      $group_bundles = og_get_all_group_bundle();
+      if (isset($group_bundles['node']) && isset($group_bundles['node']['group'])) {
+        unset($group_bundles['node']['group']);
+      }
+      $excluded_groups = array_keys($group_bundles);
+      if (in_array($group_name, $excluded_groups)) {
+        unset($pipe['field_instance'][$delta]);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.panelizer.inc b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.panelizer.inc
index c55d237973fcdb7431eb3762b5a25b93f235575b..0431bfb690c5258cf2ef022e85b2bb65ad263188 100644
--- a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.panelizer.inc
+++ b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.panelizer.inc
@@ -10,441 +10,447 @@
 function commons_groups_pages_panelizer_defaults() {
   $export = array();
 
-  $panelizer = new stdClass();
-  $panelizer->disabled = FALSE; /* Edit this to true to make a default panelizer disabled initially */
-  $panelizer->api_version = 1;
-  $panelizer->name = 'node:group:default';
-  $panelizer->title = 'Default';
-  $panelizer->panelizer_type = 'node';
-  $panelizer->panelizer_key = 'group';
-  $panelizer->no_blocks = FALSE;
-  $panelizer->css_id = '';
-  $panelizer->css = '';
-  $panelizer->pipeline = 'ipe';
-  $panelizer->contexts = array();
-  $panelizer->relationships = array();
-  $panelizer->access = array();
-  $panelizer->view_mode = 'page_manager';
-  $panelizer->css_class = '';
-  $panelizer->title_element = 'H2';
-  $panelizer->link_to_entity = TRUE;
-  $panelizer->extra = '';
-  $display = new panels_display();
-  $display->layout = 'two_66_33';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
-    'style_settings' => array(
-      'default' => NULL,
-      'top' => NULL,
-      'left' => NULL,
-      'right' => NULL,
-      'bottom' => NULL,
-      'two_66_33_top' => NULL,
-      'two_66_33_first' => NULL,
-      'two_66_33_second' => NULL,
-      'two_66_33_bottom' => NULL,
-    ),
-  );
-  $display->cache = array();
-  $display->title = '%node:title';
-  $display->uuid = '819deb2a-c56c-2214-558d-c52460a89778';
-  $display->content = array();
-  $display->panels = array();
-    $pane = new stdClass();
-    $pane->pid = 'new-10f12c5b-679e-d294-b1bd-9aac845800f5';
-    $pane->panel = 'two_66_33_first';
-    $pane->type = 'node_content';
-    $pane->subtype = 'node_content';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'links' => 1,
-      'no_extras' => 0,
-      'override_title' => 1,
-      'override_title_text' => '',
-      'identifier' => '',
-      'link' => 0,
-      'leave_node_title' => 0,
-      'build_mode' => 'full',
-      'context' => 'panelizer',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $pane->uuid = '10f12c5b-679e-d294-b1bd-9aac845800f5';
-    $display->content['new-10f12c5b-679e-d294-b1bd-9aac845800f5'] = $pane;
-    $display->panels['two_66_33_first'][0] = 'new-10f12c5b-679e-d294-b1bd-9aac845800f5';
-    $pane = new stdClass();
-    $pane->pid = 'new-80b62348-7cee-e304-5d65-0ce1b6bbb216';
-    $pane->panel = 'two_66_33_first';
-    $pane->type = 'commons_bw_group';
-    $pane->subtype = 'commons_bw_group';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $pane->uuid = '80b62348-7cee-e304-5d65-0ce1b6bbb216';
-    $display->content['new-80b62348-7cee-e304-5d65-0ce1b6bbb216'] = $pane;
-    $display->panels['two_66_33_first'][1] = 'new-80b62348-7cee-e304-5d65-0ce1b6bbb216';
-    $pane = new stdClass();
-    $pane->pid = 'new-13120946-03a1-bfc4-2d74-f39dd758ebce';
-    $pane->panel = 'two_66_33_second';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'commons_events_upcoming-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => array(
-        0 => 'panelizer',
-      ),
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $pane->uuid = '13120946-03a1-bfc4-2d74-f39dd758ebce';
-    $display->content['new-13120946-03a1-bfc4-2d74-f39dd758ebce'] = $pane;
-    $display->panels['two_66_33_second'][0] = 'new-13120946-03a1-bfc4-2d74-f39dd758ebce';
-    $pane = new stdClass();
-    $pane->pid = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
-    $pane->panel = 'two_66_33_second';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'activity_group-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'items_per_page' => '4',
-      'arguments' => array(
-        'gid' => '%node:nid',
-      ),
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $pane->uuid = 'a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
-    $display->content['new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2'] = $pane;
-    $display->panels['two_66_33_second'][1] = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
-    $pane = new stdClass();
-    $pane->pid = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
-    $pane->panel = 'two_66_33_second';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'commons_radioactivity_groups_active_in_group-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'arguments' => array(
-        'gid' => '%node:nid',
-      ),
-      'context' => array(
-        0 => 'panelizer',
-      ),
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 2;
-    $pane->locks = array();
-    $pane->uuid = 'ba735f2b-4734-7724-098d-1925c6a4bb47';
-    $display->content['new-ba735f2b-4734-7724-098d-1925c6a4bb47'] = $pane;
-    $display->panels['two_66_33_second'][2] = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
-    $pane = new stdClass();
-    $pane->pid = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f';
-    $pane->panel = 'two_66_33_second';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'commons_contributors_group-panel_pane_2';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => array(
-        0 => 'panelizer',
-      ),
-    );
-    $pane->cache = array(
-      'method' => 'simple',
-      'settings' => array(
-        'lifetime' => '15',
-        'granularity' => 'context',
-      ),
-    );
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 3;
-    $pane->locks = array();
-    $pane->uuid = '52796f83-93dd-2cf4-41aa-33520dc31e5f';
-    $display->content['new-52796f83-93dd-2cf4-41aa-33520dc31e5f'] = $pane;
-    $display->panels['two_66_33_second'][3] = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = '0';
-  $panelizer->display = $display;
-  $export['node:group:default'] = $panelizer;
+  $group_bundles = og_get_all_group_bundle();
+  if (!empty($group_bundles['node'])) {
+    foreach ($group_bundles['node'] as $bundle => $name) {
+      $panelizer = new stdClass();
+      $panelizer->disabled = FALSE; /* Edit this to true to make a default panelizer disabled initially */
+      $panelizer->api_version = 1;
+      $panelizer->name = "node:$bundle:default";
+      $panelizer->title = 'Default';
+      $panelizer->panelizer_type = 'node';
+      $panelizer->panelizer_key = $bundle;
+      $panelizer->no_blocks = FALSE;
+      $panelizer->css_id = '';
+      $panelizer->css = '';
+      $panelizer->pipeline = 'ipe';
+      $panelizer->contexts = array();
+      $panelizer->relationships = array();
+      $panelizer->access = array();
+      $panelizer->view_mode = 'page_manager';
+      $panelizer->css_class = '';
+      $panelizer->title_element = 'H2';
+      $panelizer->link_to_entity = TRUE;
+      $panelizer->extra = '';
+      $display = new panels_display();
+      $display->layout = 'two_66_33';
+      $display->layout_settings = array();
+      $display->panel_settings = array(
+        'style_settings' => array(
+          'default' => NULL,
+          'top' => NULL,
+          'left' => NULL,
+          'right' => NULL,
+          'bottom' => NULL,
+          'two_66_33_top' => NULL,
+          'two_66_33_first' => NULL,
+          'two_66_33_second' => NULL,
+          'two_66_33_bottom' => NULL,
+        ),
+      );
+      $display->cache = array();
+      $display->title = '%node:title';
+      $display->uuid = '819deb2a-c56c-2214-558d-c52460a89778';
+      $display->content = array();
+      $display->panels = array();
+      $pane = new stdClass();
+      $pane->pid = 'new-10f12c5b-679e-d294-b1bd-9aac845800f5';
+      $pane->panel = 'two_66_33_first';
+      $pane->type = 'node_content';
+      $pane->subtype = 'node_content';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'links' => 1,
+        'no_extras' => 0,
+        'override_title' => 1,
+        'override_title_text' => '',
+        'identifier' => '',
+        'link' => 0,
+        'leave_node_title' => 0,
+        'build_mode' => 'full',
+        'context' => 'panelizer',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 0;
+      $pane->locks = array();
+      $pane->uuid = '10f12c5b-679e-d294-b1bd-9aac845800f5';
+      $display->content['new-10f12c5b-679e-d294-b1bd-9aac845800f5'] = $pane;
+      $display->panels['two_66_33_first'][0] = 'new-10f12c5b-679e-d294-b1bd-9aac845800f5';
+      $pane = new stdClass();
+      $pane->pid = 'new-80b62348-7cee-e304-5d65-0ce1b6bbb216';
+      $pane->panel = 'two_66_33_first';
+      $pane->type = 'commons_bw_group';
+      $pane->subtype = 'commons_bw_group';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'override_title' => 0,
+        'override_title_text' => '',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 1;
+      $pane->locks = array();
+      $pane->uuid = '80b62348-7cee-e304-5d65-0ce1b6bbb216';
+      $display->content['new-80b62348-7cee-e304-5d65-0ce1b6bbb216'] = $pane;
+      $display->panels['two_66_33_first'][1] = 'new-80b62348-7cee-e304-5d65-0ce1b6bbb216';
+      $pane = new stdClass();
+      $pane->pid = 'new-13120946-03a1-bfc4-2d74-f39dd758ebce';
+      $pane->panel = 'two_66_33_second';
+      $pane->type = 'views_panes';
+      $pane->subtype = 'commons_events_upcoming-panel_pane_1';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'context' => array(
+          0 => 'panelizer',
+        ),
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 0;
+      $pane->locks = array();
+      $pane->uuid = '13120946-03a1-bfc4-2d74-f39dd758ebce';
+      $display->content['new-13120946-03a1-bfc4-2d74-f39dd758ebce'] = $pane;
+      $display->panels['two_66_33_second'][0] = 'new-13120946-03a1-bfc4-2d74-f39dd758ebce';
+      $pane = new stdClass();
+      $pane->pid = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
+      $pane->panel = 'two_66_33_second';
+      $pane->type = 'views_panes';
+      $pane->subtype = 'activity_group-panel_pane_1';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'items_per_page' => '4',
+        'arguments' => array(
+          'gid' => '%node:nid',
+        ),
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 1;
+      $pane->locks = array();
+      $pane->uuid = 'a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
+      $display->content['new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2'] = $pane;
+      $display->panels['two_66_33_second'][1] = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
+      $pane = new stdClass();
+      $pane->pid = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
+      $pane->panel = 'two_66_33_second';
+      $pane->type = 'views_panes';
+      $pane->subtype = 'commons_radioactivity_groups_active_in_group-panel_pane_1';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'arguments' => array(
+          'gid' => '%node:nid',
+        ),
+        'context' => array(
+          0 => 'panelizer',
+        ),
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 2;
+      $pane->locks = array();
+      $pane->uuid = 'ba735f2b-4734-7724-098d-1925c6a4bb47';
+      $display->content['new-ba735f2b-4734-7724-098d-1925c6a4bb47'] = $pane;
+      $display->panels['two_66_33_second'][2] = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
+      $pane = new stdClass();
+      $pane->pid = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f';
+      $pane->panel = 'two_66_33_second';
+      $pane->type = 'views_panes';
+      $pane->subtype = 'commons_contributors_group-panel_pane_2';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'context' => array(
+          0 => 'panelizer',
+        ),
+      );
+      $pane->cache = array(
+        'method' => 'simple',
+        'settings' => array(
+          'lifetime' => '15',
+          'granularity' => 'context',
+        ),
+      );
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 3;
+      $pane->locks = array();
+      $pane->uuid = '52796f83-93dd-2cf4-41aa-33520dc31e5f';
+      $display->content['new-52796f83-93dd-2cf4-41aa-33520dc31e5f'] = $pane;
+      $display->panels['two_66_33_second'][3] = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f';
+      $display->hide_title = PANELS_TITLE_FIXED;
+      $display->title_pane = '0';
+      $panelizer->display = $display;
+      $export["node:$bundle:default"] = $panelizer;
+
+      $panelizer = new stdClass();
+      $panelizer->disabled = FALSE; /* Edit this to true to make a default panelizer disabled initially */
+      $panelizer->api_version = 1;
+      $panelizer->name = "node:$bundle:default:teaser";
+      $panelizer->title = 'Default';
+      $panelizer->panelizer_type = 'node';
+      $panelizer->panelizer_key = "$bundle";
+      $panelizer->no_blocks = FALSE;
+      $panelizer->css_id = '';
+      $panelizer->css = '';
+      $panelizer->pipeline = 'standard';
+      $panelizer->contexts = array();
+      $panelizer->relationships = array();
+      $panelizer->access = array();
+      $panelizer->view_mode = 'teaser';
+      $panelizer->css_class = '';
+      $panelizer->title_element = 'H2';
+      $panelizer->link_to_entity = TRUE;
+      $panelizer->extra = array();
+      $display = new panels_display();
+      $display->layout = 'one';
+      $display->layout_settings = array();
+      $display->panel_settings = array(
+        'style_settings' => array(
+          'default' => NULL,
+          'one_main' => NULL,
+        ),
+      );
+      $display->cache = array();
+      $display->title = '%node:title';
+      $display->uuid = '2880dc3a-9be6-dc34-a563-b9748d152f92';
+      $display->content = array();
+      $display->panels = array();
+      $pane = new stdClass();
+      $pane->pid = 'new-026f9d2d-fd0e-d794-1971-47eb628a7f6e';
+      $pane->panel = 'one_main';
+      $pane->type = 'entity_field';
+      $pane->subtype = 'node:group_group';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'label' => 'hidden',
+        'formatter' => 'commons_groups_group_subscribe',
+        'delta_limit' => 0,
+        'delta_offset' => '0',
+        'delta_reversed' => FALSE,
+        'formatter_settings' => array(),
+        'context' => 'panelizer',
+        'override_title' => 0,
+        'override_title_text' => '',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 0;
+      $pane->locks = array();
+      $pane->uuid = '026f9d2d-fd0e-d794-1971-47eb628a7f6e';
+      $display->content['new-026f9d2d-fd0e-d794-1971-47eb628a7f6e'] = $pane;
+      $display->panels['one_main'][0] = 'new-026f9d2d-fd0e-d794-1971-47eb628a7f6e';
+      $pane = new stdClass();
+      $pane->pid = 'new-13859111-e3fa-5e54-a93c-57f09d719e38';
+      $pane->panel = 'one_main';
+      $pane->type = 'token';
+      $pane->subtype = 'node:commons-groups-group-contributors-count-topics';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'sanitize' => 0,
+        'context' => 'panelizer',
+        'override_title' => 0,
+        'override_title_text' => '',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 1;
+      $pane->locks = array();
+      $pane->uuid = '13859111-e3fa-5e54-a93c-57f09d719e38';
+      $display->content['new-13859111-e3fa-5e54-a93c-57f09d719e38'] = $pane;
+      $display->panels['one_main'][1] = 'new-13859111-e3fa-5e54-a93c-57f09d719e38';
+      $pane = new stdClass();
+      $pane->pid = 'new-f7a3719c-d7be-f024-ed91-c8c0df943df4';
+      $pane->panel = 'one_main';
+      $pane->type = 'token';
+      $pane->subtype = 'node:flag-commons-follow-group-link';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'sanitize' => 0,
+        'context' => 'panelizer',
+        'override_title' => 1,
+        'override_title_text' => '',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 2;
+      $pane->locks = array();
+      $pane->uuid = 'f7a3719c-d7be-f024-ed91-c8c0df943df4';
+      $display->content['new-f7a3719c-d7be-f024-ed91-c8c0df943df4'] = $pane;
+      $display->panels['one_main'][2] = 'new-f7a3719c-d7be-f024-ed91-c8c0df943df4';
+      $pane = new stdClass();
+      $pane->pid = 'new-926a99b3-8e75-aa14-2542-16f2ab9e70b3';
+      $pane->panel = 'one_main';
+      $pane->type = 'entity_field';
+      $pane->subtype = 'node:field_group_logo';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'label' => 'hidden',
+        'formatter' => 'image',
+        'delta_limit' => 0,
+        'delta_offset' => '0',
+        'delta_reversed' => FALSE,
+        'formatter_settings' => array(
+          'image_style' => '50x50',
+          'image_link' => 'content',
+        ),
+        'context' => 'panelizer',
+        'override_title' => 0,
+        'override_title_text' => '',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 3;
+      $pane->locks = array();
+      $pane->uuid = '926a99b3-8e75-aa14-2542-16f2ab9e70b3';
+      $display->content['new-926a99b3-8e75-aa14-2542-16f2ab9e70b3'] = $pane;
+      $display->panels['one_main'][3] = 'new-926a99b3-8e75-aa14-2542-16f2ab9e70b3';
+      $pane = new stdClass();
+      $pane->pid = 'new-c22911c5-3c21-75b4-c5f3-80efb733956b';
+      $pane->panel = 'one_main';
+      $pane->type = 'entity_field';
+      $pane->subtype = 'node:body';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'label' => 'hidden',
+        'formatter' => 'text_summary_or_trimmed',
+        'delta_limit' => 0,
+        'delta_offset' => '0',
+        'delta_reversed' => FALSE,
+        'formatter_settings' => array(
+          'trim_length' => '600',
+        ),
+        'context' => 'panelizer',
+        'override_title' => 0,
+        'override_title_text' => 'Por que no se ve?',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 4;
+      $pane->locks = array();
+      $pane->uuid = 'c22911c5-3c21-75b4-c5f3-80efb733956b';
+      $display->content['new-c22911c5-3c21-75b4-c5f3-80efb733956b'] = $pane;
+      $display->panels['one_main'][4] = 'new-c22911c5-3c21-75b4-c5f3-80efb733956b';
+      $pane = new stdClass();
+      $pane->pid = 'new-cb706c02-36e8-a414-c9f5-c34bf15861ca';
+      $pane->panel = 'one_main';
+      $pane->type = 'views';
+      $pane->subtype = 'commons_groups_recent_content';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'override_pager_settings' => 0,
+        'use_pager' => 0,
+        'nodes_per_page' => '5',
+        'pager_id' => '0',
+        'offset' => '0',
+        'more_link' => 0,
+        'feed_icons' => 0,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'block',
+        'context' => array(
+          0 => 'panelizer.nid',
+        ),
+        'override_title' => 1,
+        'override_title_text' => 'Recent content',
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 5;
+      $pane->locks = array();
+      $pane->uuid = 'cb706c02-36e8-a414-c9f5-c34bf15861ca';
+      $display->content['new-cb706c02-36e8-a414-c9f5-c34bf15861ca'] = $pane;
+      $display->panels['one_main'][5] = 'new-cb706c02-36e8-a414-c9f5-c34bf15861ca';
+      $pane = new stdClass();
+      $pane->pid = 'new-6c3207ac-19f3-8184-11ba-e3aee789a9c8';
+      $pane->panel = 'one_main';
+      $pane->type = 'views_panes';
+      $pane->subtype = 'commons_contributors_group-panel_pane_1';
+      $pane->shown = TRUE;
+      $pane->access = array();
+      $pane->configuration = array(
+        'context' => array(
+          0 => 'panelizer',
+        ),
+      );
+      $pane->cache = array();
+      $pane->style = array(
+        'settings' => NULL,
+      );
+      $pane->css = array();
+      $pane->extras = array();
+      $pane->position = 6;
+      $pane->locks = array();
+      $pane->uuid = '6c3207ac-19f3-8184-11ba-e3aee789a9c8';
+      $display->content['new-6c3207ac-19f3-8184-11ba-e3aee789a9c8'] = $pane;
+      $display->panels['one_main'][6] = 'new-6c3207ac-19f3-8184-11ba-e3aee789a9c8';
+      $display->hide_title = PANELS_TITLE_FIXED;
+      $display->title_pane = '0';
+      $panelizer->display = $display;
+      $export["node:$bundle:default:teaser"] = $panelizer;
+    }
+  }
 
-  $panelizer = new stdClass();
-  $panelizer->disabled = FALSE; /* Edit this to true to make a default panelizer disabled initially */
-  $panelizer->api_version = 1;
-  $panelizer->name = 'node:group:default:teaser';
-  $panelizer->title = 'Default';
-  $panelizer->panelizer_type = 'node';
-  $panelizer->panelizer_key = 'group';
-  $panelizer->no_blocks = FALSE;
-  $panelizer->css_id = '';
-  $panelizer->css = '';
-  $panelizer->pipeline = 'standard';
-  $panelizer->contexts = array();
-  $panelizer->relationships = array();
-  $panelizer->access = array();
-  $panelizer->view_mode = 'teaser';
-  $panelizer->css_class = '';
-  $panelizer->title_element = 'H2';
-  $panelizer->link_to_entity = TRUE;
-  $panelizer->extra = array();
-  $display = new panels_display();
-  $display->layout = 'one';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
-    'style_settings' => array(
-      'default' => NULL,
-      'one_main' => NULL,
-    ),
-  );
-  $display->cache = array();
-  $display->title = '%node:title';
-  $display->uuid = '2880dc3a-9be6-dc34-a563-b9748d152f92';
-  $display->content = array();
-  $display->panels = array();
-    $pane = new stdClass();
-    $pane->pid = 'new-026f9d2d-fd0e-d794-1971-47eb628a7f6e';
-    $pane->panel = 'one_main';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:group_group';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'hidden',
-      'formatter' => 'commons_groups_group_subscribe',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(),
-      'context' => 'panelizer',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $pane->uuid = '026f9d2d-fd0e-d794-1971-47eb628a7f6e';
-    $display->content['new-026f9d2d-fd0e-d794-1971-47eb628a7f6e'] = $pane;
-    $display->panels['one_main'][0] = 'new-026f9d2d-fd0e-d794-1971-47eb628a7f6e';
-    $pane = new stdClass();
-    $pane->pid = 'new-13859111-e3fa-5e54-a93c-57f09d719e38';
-    $pane->panel = 'one_main';
-    $pane->type = 'token';
-    $pane->subtype = 'node:commons-groups-group-contributors-count-topics';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'sanitize' => 0,
-      'context' => 'panelizer',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $pane->uuid = '13859111-e3fa-5e54-a93c-57f09d719e38';
-    $display->content['new-13859111-e3fa-5e54-a93c-57f09d719e38'] = $pane;
-    $display->panels['one_main'][1] = 'new-13859111-e3fa-5e54-a93c-57f09d719e38';
-    $pane = new stdClass();
-    $pane->pid = 'new-f7a3719c-d7be-f024-ed91-c8c0df943df4';
-    $pane->panel = 'one_main';
-    $pane->type = 'token';
-    $pane->subtype = 'node:flag-commons-follow-group-link';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'sanitize' => 0,
-      'context' => 'panelizer',
-      'override_title' => 1,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 2;
-    $pane->locks = array();
-    $pane->uuid = 'f7a3719c-d7be-f024-ed91-c8c0df943df4';
-    $display->content['new-f7a3719c-d7be-f024-ed91-c8c0df943df4'] = $pane;
-    $display->panels['one_main'][2] = 'new-f7a3719c-d7be-f024-ed91-c8c0df943df4';
-    $pane = new stdClass();
-    $pane->pid = 'new-926a99b3-8e75-aa14-2542-16f2ab9e70b3';
-    $pane->panel = 'one_main';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:field_group_logo';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'hidden',
-      'formatter' => 'image',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(
-        'image_style' => '50x50',
-        'image_link' => 'content',
-      ),
-      'context' => 'panelizer',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 3;
-    $pane->locks = array();
-    $pane->uuid = '926a99b3-8e75-aa14-2542-16f2ab9e70b3';
-    $display->content['new-926a99b3-8e75-aa14-2542-16f2ab9e70b3'] = $pane;
-    $display->panels['one_main'][3] = 'new-926a99b3-8e75-aa14-2542-16f2ab9e70b3';
-    $pane = new stdClass();
-    $pane->pid = 'new-c22911c5-3c21-75b4-c5f3-80efb733956b';
-    $pane->panel = 'one_main';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:body';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'hidden',
-      'formatter' => 'text_summary_or_trimmed',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(
-        'trim_length' => '600',
-      ),
-      'context' => 'panelizer',
-      'override_title' => 0,
-      'override_title_text' => 'Por que no se ve?',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 4;
-    $pane->locks = array();
-    $pane->uuid = 'c22911c5-3c21-75b4-c5f3-80efb733956b';
-    $display->content['new-c22911c5-3c21-75b4-c5f3-80efb733956b'] = $pane;
-    $display->panels['one_main'][4] = 'new-c22911c5-3c21-75b4-c5f3-80efb733956b';
-    $pane = new stdClass();
-    $pane->pid = 'new-cb706c02-36e8-a414-c9f5-c34bf15861ca';
-    $pane->panel = 'one_main';
-    $pane->type = 'views';
-    $pane->subtype = 'commons_groups_recent_content';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '5',
-      'pager_id' => '0',
-      'offset' => '0',
-      'more_link' => 0,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block',
-      'context' => array(
-        0 => 'panelizer.nid',
-      ),
-      'override_title' => 1,
-      'override_title_text' => 'Recent content',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 5;
-    $pane->locks = array();
-    $pane->uuid = 'cb706c02-36e8-a414-c9f5-c34bf15861ca';
-    $display->content['new-cb706c02-36e8-a414-c9f5-c34bf15861ca'] = $pane;
-    $display->panels['one_main'][5] = 'new-cb706c02-36e8-a414-c9f5-c34bf15861ca';
-    $pane = new stdClass();
-    $pane->pid = 'new-6c3207ac-19f3-8184-11ba-e3aee789a9c8';
-    $pane->panel = 'one_main';
-    $pane->type = 'views_panes';
-    $pane->subtype = 'commons_contributors_group-panel_pane_1';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'context' => array(
-        0 => 'panelizer',
-      ),
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 6;
-    $pane->locks = array();
-    $pane->uuid = '6c3207ac-19f3-8184-11ba-e3aee789a9c8';
-    $display->content['new-6c3207ac-19f3-8184-11ba-e3aee789a9c8'] = $pane;
-    $display->panels['one_main'][6] = 'new-6c3207ac-19f3-8184-11ba-e3aee789a9c8';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = '0';
-  $panelizer->display = $display;
-  $export['node:group:default:teaser'] = $panelizer;
 
   return $export;
 }
diff --git a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.strongarm.inc b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.strongarm.inc
index 626f9cc4b8938d57c0dc3f32eee67a5e4328e57e..8de19ca6e53c04ba89bdfc5fb293364ae42a1d15 100644
--- a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.strongarm.inc
+++ b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.strongarm.inc
@@ -10,31 +10,37 @@
 function commons_groups_pages_strongarm() {
   $export = array();
 
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'panelizer_defaults_node_group';
-  $strongarm->value = array(
-    'status' => 1,
-    'view modes' => array(
-      'page_manager' => array(
+  $group_bundles = og_get_all_group_bundle();
+  if (!empty($group_bundles['node'])) {
+    // Don't alter the group panel.
+    foreach ($group_bundles['node'] as $bundle => $name) {
+      $strongarm = new stdClass();
+      $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+      $strongarm->api_version = 1;
+      $strongarm->name = "panelizer_defaults_node_$bundle";
+      $strongarm->value = array(
         'status' => 1,
-        'default' => 1,
-        'choice' => 0,
-      ),
-      'default' => array(
-        'status' => 0,
-        'default' => 0,
-        'choice' => 0,
-      ),
-      'teaser' => array(
-        'status' => 1,
-        'default' => 1,
-        'choice' => 0,
-      ),
-    ),
-  );
-  $export['panelizer_defaults_node_group'] = $strongarm;
+        'view modes' => array(
+          'page_manager' => array(
+            'status' => 1,
+            'default' => 1,
+            'choice' => 0,
+          ),
+          'default' => array(
+            'status' => 0,
+            'default' => 0,
+            'choice' => 0,
+          ),
+          'teaser' => array(
+            'status' => 1,
+            'default' => 1,
+            'choice' => 0,
+          ),
+        ),
+      );
+      $export["panelizer_defaults_node_$bundle"] = $strongarm;
+    }
+  }
 
   return $export;
 }
diff --git a/modules/commons/commons_polls/commons_polls.module b/modules/commons/commons_polls/commons_polls.module
index bf5f98af32f8cb66948bb9c8c0e1139abffd5358..7e1ec8df1d16fb0e0b519caa80e0463049c1f47f 100644
--- a/modules/commons/commons_polls/commons_polls.module
+++ b/modules/commons/commons_polls/commons_polls.module
@@ -30,6 +30,7 @@ function commons_polls_commons_entity_integration() {
     'node' => array(
       'poll' => array(
         'media' => TRUE,
+        'is_group_content' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_posts/commons_posts.module b/modules/commons/commons_posts/commons_posts.module
index 1d346115d677d4c33f3294787cf4936d13312dc1..8c3b11d5b4806124d3aeb40be86aaad4b027b992 100644
--- a/modules/commons/commons_posts/commons_posts.module
+++ b/modules/commons/commons_posts/commons_posts.module
@@ -99,6 +99,7 @@ function commons_posts_commons_entity_integration() {
     'node' => array(
       'post' => array(
         'media' => TRUE,
+        'is_group_content' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_q_a/commons_q_a.module b/modules/commons/commons_q_a/commons_q_a.module
index dec755baea5f23aa41c0a32e25fcbc7fcd45a105..b406183d087827125eab6e49ab6ec18e8feb7c3e 100644
--- a/modules/commons/commons_q_a/commons_q_a.module
+++ b/modules/commons/commons_q_a/commons_q_a.module
@@ -290,10 +290,12 @@ function commons_q_a_commons_entity_integration() {
     'node' => array(
       'question' => array(
         'media' => TRUE,
+        'is_group_content' => TRUE,
       ),
       'answer' => array(
         'exclude_topics' => TRUE,
         'exclude_rate' => TRUE,
+        'is_group_content' => TRUE,
       ),
     ),
   );
diff --git a/modules/commons/commons_wikis/commons_wikis.module b/modules/commons/commons_wikis/commons_wikis.module
index 356bdf73b4ee6223e5f3f974f06e21552a2d5960..349cce34940e763379c6193ac9e7d57690343c87 100644
--- a/modules/commons/commons_wikis/commons_wikis.module
+++ b/modules/commons/commons_wikis/commons_wikis.module
@@ -163,6 +163,7 @@ function commons_wikis_commons_entity_integration() {
     'node' => array(
       'wiki' => array(
         'auto_title_instance' => FALSE,
+        'is_group_content' => TRUE,
       ),
     ),
   );