diff --git a/drupal-org.make b/drupal-org.make
index 881127aa..5e098e25 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -153,6 +153,10 @@ projects[webform_clear][patch][2471671] = https://www.drupal.org/files/issues/24
 ; https://www.drupal.org/node/2399645
 projects[hansel][patch][2399645] = https://www.drupal.org/files/issues/hansel-broken-token-generation-2399645-1.patch
 
+; Warning: count(): Parameter must be an array or an object that implements Countable in hansel_get_breadcrumbs()
+; https://www.drupal.org/project/hansel/issues/3136852
+projects[hansel][patch][3136852] = https://www.drupal.org/files/issues/2020-05-15/Parameter-must-be-an-array-or-an-object-that-implements-Countable-3136852-3.patch
+
 ; Link
 ; URL validation rejects existing valid content after upgrade to 7.x-1.4
 ; https://www.drupal.org/node/2666912
diff --git a/modules/features/atos_esuite/atos_esuite.install b/modules/features/atos_esuite/atos_esuite.install
index 49b7d268..b8a23b5c 100644
--- a/modules/features/atos_esuite/atos_esuite.install
+++ b/modules/features/atos_esuite/atos_esuite.install
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Install file.
@@ -71,6 +72,11 @@ function atos_esuite_uninstall() {
   variable_del('atos_esuite_url');
   variable_del('atos_esuite_chunk_size');
   variable_del('atos_default_format');
+
+  // DIMPACT-35: Drop table on uninstall to prevent error on reinstall.
+  if (db_table_exists('atos_esuite')) {
+    db_drop_table('atos_esuite');
+  }
 }
 
 /**
diff --git a/modules/features/wim_faq/wim_faq.module b/modules/features/wim_faq/wim_faq.module
index b7343514..ea8d553d 100644
--- a/modules/features/wim_faq/wim_faq.module
+++ b/modules/features/wim_faq/wim_faq.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Code for the WIM FAQ feature.
@@ -23,7 +24,6 @@ function wim_faq_views_pre_render($view) {
  */
 function wim_faq_form_felix_attributes_form_alter(&$form, &$form_state, $form_id) {
   $felix_block = $form['#felix_block'];
-  $felix_block_config = $felix_block->data['config'];
   if ($felix_block->delta === 'faq-faq_overview_block') {
     $faq_vocabulary = taxonomy_vocabulary_machine_name_load('faq_categories');
     $faq_terms = taxonomy_get_tree($faq_vocabulary->vid);
@@ -36,9 +36,11 @@ function wim_faq_form_felix_attributes_form_alter(&$form, &$form_state, $form_id
         '#type' => 'select',
         '#title' => t('FAQ category'),
         '#options' => $faq_categories,
-        '#default_value' => $felix_block_config['faq_category'],
         '#required' => TRUE,
       ];
+      if (isset($felix_block->data['config']['faq_category'])) {
+        $form['faq_category']['#default_value'] = $felix_block->data['config']['faq_category'];
+      }
     }
   }
 }
@@ -108,6 +110,4 @@ function wim_faq_block_view($delta = '', $config = []) {
 
   return NULL;
 
-
-  $t='';
 }