diff --git a/composer.lock b/composer.lock
index 0c140328a..9baedbbd3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2992,17 +2992,17 @@
         },
         {
             "name": "drupal/easy_breadcrumb",
-            "version": "2.0.7",
+            "version": "2.0.8",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/easy_breadcrumb.git",
-                "reference": "2.0.7"
+                "reference": "2.0.8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.7.zip",
-                "reference": "2.0.7",
-                "shasum": "a17524ffc2c76bc0aedb04116c3647dc2025e762"
+                "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.8.zip",
+                "reference": "2.0.8",
+                "shasum": "49bfd9b8b0ec664963d05e360449876745cf2868"
             },
             "require": {
                 "drupal/core": "^9.2 || ^10 || ^11"
@@ -3010,8 +3010,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.7",
-                    "datestamp": "1719427042",
+                    "version": "2.0.8",
+                    "datestamp": "1723545040",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4241,16 +4241,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.6.1",
+            "version": "6.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "04e7ec2da69b8a86765c409ed09d3dd309c48d64"
+                "reference": "260ed89837be3b1ae9a19248a0e21717b9597885"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/04e7ec2da69b8a86765c409ed09d3dd309c48d64",
-                "reference": "04e7ec2da69b8a86765c409ed09d3dd309c48d64",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/260ed89837be3b1ae9a19248a0e21717b9597885",
+                "reference": "260ed89837be3b1ae9a19248a0e21717b9597885",
                 "shasum": ""
             },
             "require": {
@@ -4268,10 +4268,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.1",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.3",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-08-13T05:25:17+00:00"
+            "time": "2024-08-14T08:40:02+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
diff --git a/conf/cmi/core.entity_form_display.node.survey.default.yml b/conf/cmi/core.entity_form_display.node.survey.default.yml
index 7d3ff31d0..b498ab7e3 100644
--- a/conf/cmi/core.entity_form_display.node.survey.default.yml
+++ b/conf/cmi/core.entity_form_display.node.survey.default.yml
@@ -39,6 +39,13 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_publish_externally:
+    type: boolean_checkbox
+    weight: 14
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_survey_content_pages:
     type: select2_entity_reference
     weight: 14
@@ -128,13 +135,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_publish_externally:
-    type: boolean_checkbox
-    weight: 14
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
   hide_sidebar_navigation: true
   promote: true
diff --git a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
index b6b689a8d..9f772c553 100644
--- a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
+++ b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
@@ -79,6 +79,7 @@ content:
     region: content
 hidden:
   annif_keywords: true
+  field_annif_keywords: true
   field_content: true
   field_lead_in: true
   field_main_image_caption: true
@@ -93,4 +94,3 @@ hidden:
   search_api_excerpt: true
   show_annif_block: true
   toc_enabled: true
-  field_annif_keywords: true
diff --git a/conf/cmi/language/de/key.key.tfa.yml b/conf/cmi/language/de/key.key.tfa.yml
new file mode 100644
index 000000000..8875cd6bd
--- /dev/null
+++ b/conf/cmi/language/de/key.key.tfa.yml
@@ -0,0 +1 @@
+label: TFA
diff --git a/conf/cmi/language/de/tfa.settings.yml b/conf/cmi/language/de/tfa.settings.yml
new file mode 100644
index 000000000..67899d557
--- /dev/null
+++ b/conf/cmi/language/de/tfa.settings.yml
@@ -0,0 +1,8 @@
+help_text: 'Contact support to reset your access'
+mail:
+  tfa_enabled_configuration:
+    subject: 'Your [site:name] account now has two-factor authentication'
+    body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team"
+  tfa_disabled_configuration:
+    subject: 'Your [site:name] account no longer has two-factor authentication'
+    body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team"