diff --git a/.gitattributes b/.gitattributes
index 76ea8fee..e7b792f8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."
diff --git a/composer.lock b/composer.lock
index e9cee054..28604d89 100644
--- a/composer.lock
+++ b/composer.lock
@@ -641,32 +641,32 @@
         },
         {
             "name": "consolidation/log",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/log.git",
-                "reference": "caaad9d70dae54eb49002666f000e3c607066878"
+                "reference": "c27a3beb36137c141ccbce0d89f64befb243c015"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/caaad9d70dae54eb49002666f000e3c607066878",
-                "reference": "caaad9d70dae54eb49002666f000e3c607066878",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/c27a3beb36137c141ccbce0d89f64befb243c015",
+                "reference": "c27a3beb36137c141ccbce0d89f64befb243c015",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.0.0",
                 "psr/log": "^3",
-                "symfony/console": "^5 || ^6"
+                "symfony/console": "^5 || ^6 || ^7"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=7.5.20",
+                "phpunit/phpunit": "^7.5.20 || ^8 || ^9",
                 "squizlabs/php_codesniffer": "^3",
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "2.x-dev"
+                "platform": {
+                    "php": "8.2.17"
                 }
             },
             "autoload": {
@@ -687,36 +687,36 @@
             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
             "support": {
                 "issues": "https://github.com/consolidation/log/issues",
-                "source": "https://github.com/consolidation/log/tree/3.0.0"
+                "source": "https://github.com/consolidation/log/tree/3.1.0"
             },
-            "time": "2022-04-05T16:53:32+00:00"
+            "time": "2024-04-04T23:50:25+00:00"
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "4.3.2",
+            "version": "4.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58"
+                "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58",
-                "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/7a611b01eb48eb19cd54672339fc08c0985bf540",
+                "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540",
                 "shasum": ""
             },
             "require": {
                 "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3",
                 "php": ">=7.1.3",
-                "symfony/console": "^4 || ^5 || ^6",
-                "symfony/finder": "^4 || ^5 || ^6"
+                "symfony/console": "^4 || ^5 || ^6 || ^7",
+                "symfony/finder": "^4 || ^5 || ^6 || ^7"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.4.2",
                 "phpunit/phpunit": "^7 || ^8 || ^9",
                 "squizlabs/php_codesniffer": "^3",
-                "symfony/var-dumper": "^4 || ^5 || ^6",
-                "symfony/yaml": "^4 || ^5 || ^6",
+                "symfony/var-dumper": "^4 || ^5 || ^6 || ^7",
+                "symfony/yaml": "^4 || ^5 || ^6 || ^7",
                 "yoast/phpunit-polyfills": "^1"
             },
             "suggest": {
@@ -741,9 +741,9 @@
             "description": "Format text by applying transformations provided by plug-in formatters.",
             "support": {
                 "issues": "https://github.com/consolidation/output-formatters/issues",
-                "source": "https://github.com/consolidation/output-formatters/tree/4.3.2"
+                "source": "https://github.com/consolidation/output-formatters/tree/4.5.0"
             },
-            "time": "2023-07-06T04:45:41+00:00"
+            "time": "2024-04-02T15:18:52+00:00"
         },
         {
             "name": "consolidation/robo",
@@ -934,16 +934,16 @@
         },
         {
             "name": "consolidation/site-process",
-            "version": "5.2.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/site-process.git",
-                "reference": "6c44638d7af8a8b4abe12c3180701243f480539d"
+                "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/site-process/zipball/6c44638d7af8a8b4abe12c3180701243f480539d",
-                "reference": "6c44638d7af8a8b4abe12c3180701243f480539d",
+                "url": "https://api.github.com/repos/consolidation/site-process/zipball/5e8eff50fd0015e7ca0b6ce4082cacef012f2f77",
+                "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77",
                 "shasum": ""
             },
             "require": {
@@ -985,9 +985,9 @@
             "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.",
             "support": {
                 "issues": "https://github.com/consolidation/site-process/issues",
-                "source": "https://github.com/consolidation/site-process/tree/5.2.0"
+                "source": "https://github.com/consolidation/site-process/tree/5.3.0"
             },
-            "time": "2022-12-06T17:57:16+00:00"
+            "time": "2024-04-01T12:42:12+00:00"
         },
         {
             "name": "cweagans/composer-patches",
@@ -1703,26 +1703,26 @@
         },
         {
             "name": "drupal/ckeditor5_paste_filter",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/ckeditor5_paste_filter.git",
-                "reference": "1.0.0"
+                "reference": "1.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/ckeditor5_paste_filter-1.0.0.zip",
-                "reference": "1.0.0",
-                "shasum": "f04752267a09489e9637add278d4c661150b46f7"
+                "url": "https://ftp.drupal.org/files/projects/ckeditor5_paste_filter-1.0.1.zip",
+                "reference": "1.0.1",
+                "shasum": "6a8f898f2c8845c5eb182579885fbbd7427729da"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10"
+                "drupal/core": "^9.3 || ^10 || ^11"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.0",
-                    "datestamp": "1700503273",
+                    "version": "1.0.1",
+                    "datestamp": "1711569635",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -1995,16 +1995,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "10.2.4",
+            "version": "10.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff"
+                "reference": "dddd242b74f40df892a7f16a48245c3b76d9b003"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/d1c5b44adfc79bda03252471491b0fba89d87eff",
-                "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff",
+                "url": "https://api.github.com/repos/drupal/core/zipball/dddd242b74f40df892a7f16a48245c3b76d9b003",
+                "reference": "dddd242b74f40df892a7f16a48245c3b76d9b003",
                 "shasum": ""
             },
             "require": {
@@ -2152,9 +2152,9 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/10.2.4"
+                "source": "https://github.com/drupal/core/tree/10.2.5"
             },
-            "time": "2024-03-06T08:23:56+00:00"
+            "time": "2024-04-03T07:19:20+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
@@ -2614,17 +2614,17 @@
         },
         {
             "name": "drupal/editoria11y",
-            "version": "2.1.8",
+            "version": "2.1.9",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/editoria11y.git",
-                "reference": "2.1.8"
+                "reference": "2.1.9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.8.zip",
-                "reference": "2.1.8",
-                "shasum": "6ec91608cb6cd0db75a9a9bd8681616080cb8e76"
+                "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.9.zip",
+                "reference": "2.1.9",
+                "shasum": "32ef094ba01c4d027fdc2fb5bab0faf2b817dfc3"
             },
             "require": {
                 "drupal/core": "^9 || ^10"
@@ -2632,8 +2632,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.1.8",
-                    "datestamp": "1707937463",
+                    "version": "2.1.9",
+                    "datestamp": "1712248365",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2667,10 +2667,10 @@
                 }
             ],
             "description": "Editoria11y (\"editorial accessibility\") is a user-friendly accessibility checker.",
-            "homepage": "http://drupal.org/project/editoria11y",
+            "homepage": "https://drupal.org/project/editoria11y",
             "support": {
                 "source": "https://git.drupalcode.org/project/editoria11y",
-                "issues": "http://drupal.org/project/issues/editoria11y"
+                "issues": "https://drupal.org/project/issues/editoria11y"
             }
         },
         {
@@ -3734,16 +3734,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.4.33",
+            "version": "6.4.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a"
+                "reference": "3f3e9804313966576ad5be2104ebe9f068d7bf16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a",
-                "reference": "8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/3f3e9804313966576ad5be2104ebe9f068d7bf16",
+                "reference": "3f3e9804313966576ad5be2104ebe9f068d7bf16",
                 "shasum": ""
             },
             "require": {
@@ -3761,10 +3761,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.33",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.38",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-03-26T11:31:45+00:00"
+            "time": "2024-04-05T13:21:39+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -3853,16 +3853,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.6.7",
+            "version": "2.6.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "b31aadb20be6a5779a63159fac0074e89a7b444a"
+                "reference": "572939cdf1022388d171a990ad0849e651aa3496"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/b31aadb20be6a5779a63159fac0074e89a7b444a",
-                "reference": "b31aadb20be6a5779a63159fac0074e89a7b444a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/572939cdf1022388d171a990ad0849e651aa3496",
+                "reference": "572939cdf1022388d171a990ad0849e651aa3496",
                 "shasum": ""
             },
             "require": {
@@ -3891,10 +3891,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.7",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.8",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2024-03-25T06:33:08+00:00"
+            "time": "2024-04-04T05:12:11+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4057,16 +4057,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.3.34",
+            "version": "4.3.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "8758c44f0344feeebdeaedb41c4ee101e27fa4da"
+                "reference": "f62abb1abfc3d66f00767e9e9a81ba18b5544729"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/8758c44f0344feeebdeaedb41c4ee101e27fa4da",
-                "reference": "8758c44f0344feeebdeaedb41c4ee101e27fa4da",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f62abb1abfc3d66f00767e9e9a81ba18b5544729",
+                "reference": "f62abb1abfc3d66f00767e9e9a81ba18b5544729",
                 "shasum": ""
             },
             "require": {
@@ -4182,10 +4182,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.34",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.40",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-03-27T09:21:21+00:00"
+            "time": "2024-04-05T12:55:10+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4377,17 +4377,17 @@
         },
         {
             "name": "drupal/imagecache_external",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/imagecache_external.git",
-                "reference": "3.0.2"
+                "reference": "3.0.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.2.zip",
-                "reference": "3.0.2",
-                "shasum": "0c6254c6de9c4ecd62da6f82f231484f5178e61d"
+                "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.3.zip",
+                "reference": "3.0.3",
+                "shasum": "83f5282a1854cc981fe19cea92f9b2b9d8167dd8"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10"
@@ -4395,8 +4395,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.2",
-                    "datestamp": "1709311320",
+                    "version": "3.0.3",
+                    "datestamp": "1711900821",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5236,7 +5236,7 @@
             "extra": {
                 "drupal": {
                     "version": "8.x-1.12",
-                    "datestamp": "1696776683",
+                    "datestamp": "1712319355",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5831,20 +5831,20 @@
         },
         {
             "name": "drupal/search_api",
-            "version": "1.31.0",
+            "version": "1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/search_api.git",
-                "reference": "8.x-1.31"
+                "reference": "8.x-1.33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.31.zip",
-                "reference": "8.x-1.31",
-                "shasum": "ec8436744c34de2ede6370d4dd26875489e761bc"
+                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.33.zip",
+                "reference": "8.x-1.33",
+                "shasum": "6414709995217599839167bc638e0e49243ff714"
             },
             "require": {
-                "drupal/core": "^10.0"
+                "drupal/core": "^10.1 || ^11"
             },
             "conflict": {
                 "drupal/search_api_solr": "2.* || 3.0 || 3.1"
@@ -5862,8 +5862,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.31",
-                    "datestamp": "1700926323",
+                    "version": "8.x-1.33",
+                    "datestamp": "1712242225",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -8618,16 +8618,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.8.1",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf"
+                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
+                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
                 "shasum": ""
             },
             "require": {
@@ -8635,7 +8635,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
             },
             "type": "library",
             "extra": {
@@ -8679,9 +8679,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.8.1"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.9.0"
             },
-            "time": "2023-05-10T11:58:31+00:00"
+            "time": "2024-03-31T07:05:07+00:00"
         },
         {
             "name": "mck89/peast",
@@ -9943,16 +9943,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.2",
+            "version": "v0.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d"
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
                 "shasum": ""
             },
             "require": {
@@ -10016,9 +10016,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.2"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
             },
-            "time": "2024-03-17T01:53:00+00:00"
+            "time": "2024-04-02T15:57:53+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -10435,16 +10435,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
+                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f",
+                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f",
                 "shasum": ""
             },
             "require": {
@@ -10509,7 +10509,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.4"
+                "source": "https://github.com/symfony/console/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -10525,20 +10525,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-29T19:07:53+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6236e5e843cb763e9d0f74245678b994afea5363"
+                "reference": "31417777509923b22de5c6fb6b3ffcdebde37cb5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6236e5e843cb763e9d0f74245678b994afea5363",
-                "reference": "6236e5e843cb763e9d0f74245678b994afea5363",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/31417777509923b22de5c6fb6b3ffcdebde37cb5",
+                "reference": "31417777509923b22de5c6fb6b3ffcdebde37cb5",
                 "shasum": ""
             },
             "require": {
@@ -10590,7 +10590,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.4"
+                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -10606,7 +10606,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-27T22:00:14+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -10677,16 +10677,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a"
+                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4",
+                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4",
                 "shasum": ""
             },
             "require": {
@@ -10732,7 +10732,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.4"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -10748,7 +10748,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-19T11:56:30+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -10832,16 +10832,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224",
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224",
                 "shasum": ""
             },
             "require": {
@@ -10888,7 +10888,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -10904,20 +10904,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.3",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
+                "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/9919b5509ada52cc7f66f9a35c86a4a29955c9d3",
+                "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3",
                 "shasum": ""
             },
             "require": {
@@ -10951,7 +10951,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -10967,7 +10967,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-03-21T19:36:20+00:00"
         },
         {
             "name": "symfony/finder",
@@ -11112,16 +11112,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.5",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
+                "reference": "060038863743fd0cd982be06acecccf246d35653"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/060038863743fd0cd982be06acecccf246d35653",
+                "reference": "060038863743fd0cd982be06acecccf246d35653",
                 "shasum": ""
             },
             "require": {
@@ -11205,7 +11205,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -11221,20 +11221,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-04T21:00:47+00:00"
+            "time": "2024-04-03T06:09:15+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "791c5d31a8204cf3db0c66faab70282307f4376b"
+                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b",
-                "reference": "791c5d31a8204cf3db0c66faab70282307f4376b",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/677f34a6f4b4559e08acf73ae0aec460479e5859",
+                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859",
                 "shasum": ""
             },
             "require": {
@@ -11285,7 +11285,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.4"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -11301,20 +11301,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-03T21:33:47+00:00"
+            "time": "2024-03-27T21:14:17+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.3",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34"
+                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/14762b86918823cb42e3558cdcca62e58b5227fe",
+                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe",
                 "shasum": ""
             },
             "require": {
@@ -11335,6 +11335,7 @@
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.4|^7.0",
                 "symfony/property-access": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.3.2|^7.0"
@@ -11369,7 +11370,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.3"
+                "source": "https://github.com/symfony/mime/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -11385,7 +11386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2024-03-21T19:36:20+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -12381,16 +12382,16 @@
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v6.4.3",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "49cfb0223ec64379f7154214dcc1f7c46f3c7a47"
+                "reference": "98059dd19bae6579a294e0fe5b3dfdbeb409845a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/49cfb0223ec64379f7154214dcc1f7c46f3c7a47",
-                "reference": "49cfb0223ec64379f7154214dcc1f7c46f3c7a47",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/98059dd19bae6579a294e0fe5b3dfdbeb409845a",
+                "reference": "98059dd19bae6579a294e0fe5b3dfdbeb409845a",
                 "shasum": ""
             },
             "require": {
@@ -12444,7 +12445,7 @@
                 "psr-7"
             ],
             "support": {
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.3"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -12460,20 +12461,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-03-27T22:00:14+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.5",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
+                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
+                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
                 "shasum": ""
             },
             "require": {
@@ -12527,7 +12528,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.5"
+                "source": "https://github.com/symfony/routing/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -12543,20 +12544,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-27T12:33:30+00:00"
+            "time": "2024-03-28T13:28:49+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872"
+                "reference": "3697adf91f83516c86b4912c08c28084711ed560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/88da7f8fe03c5f4c2a69da907f1de03fab2e6872",
-                "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/3697adf91f83516c86b4912c08c28084711ed560",
+                "reference": "3697adf91f83516c86b4912c08c28084711ed560",
                 "shasum": ""
             },
             "require": {
@@ -12625,7 +12626,7 @@
             "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v6.4.4"
+                "source": "https://github.com/symfony/serializer/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -12641,20 +12642,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-27T22:00:14+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
                 "shasum": ""
             },
             "require": {
@@ -12707,7 +12708,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -12723,7 +12724,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2023-12-19T21:51:00+00:00"
         },
         {
             "name": "symfony/string",
@@ -12813,16 +12814,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
                 "shasum": ""
             },
             "require": {
@@ -12871,7 +12872,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -12887,20 +12888,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47"
+                "reference": "ca1d78e8677e966e307a63799677b64b194d735d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/1cf92edc9a94d16275efef949fa6748d11cc8f47",
-                "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/ca1d78e8677e966e307a63799677b64b194d735d",
+                "reference": "ca1d78e8677e966e307a63799677b64b194d735d",
                 "shasum": ""
             },
             "require": {
@@ -12967,7 +12968,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v6.4.4"
+                "source": "https://github.com/symfony/validator/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -12983,20 +12984,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-27T22:00:14+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1"
+                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4",
+                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4",
                 "shasum": ""
             },
             "require": {
@@ -13052,7 +13053,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -13068,26 +13069,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-15T11:23:52+00:00"
+            "time": "2024-03-19T11:56:30+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41"
+                "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
-                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c74c568d2a15a1d407cf40d61ea82bc2d521e27b",
+                "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
                 "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
@@ -13126,7 +13129,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.0.4"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -13142,7 +13145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-26T10:35:24+00:00"
+            "time": "2024-03-20T21:25:22+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -16336,16 +16339,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.27.0",
+            "version": "1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
                 "shasum": ""
             },
             "require": {
@@ -16377,9 +16380,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
             },
-            "time": "2024-03-21T13:14:53+00:00"
+            "time": "2024-04-03T18:51:33+00:00"
         },
         {
             "name": "phpstan/phpstan",
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index c42d07db..ad5b8033 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -6,6 +6,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
     - allowed_formats
@@ -18,7 +20,7 @@ dependencies:
     - readonly_field_widget
     - text
 _core:
-  default_config_hash: u4cfdWUfiLgxWmusemjNf4p9sa_VCrlVLyYe8slNTEk
+  default_config_hash: rWjpesn9mLPiT19k4RZ1DEjahx07CnmM2G6kg47-IFE
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -26,7 +28,7 @@ mode: default
 content:
   accessibility_email:
     type: readonly_field_widget
-    weight: 12
+    weight: 14
     region: content
     settings:
       label: above
@@ -36,7 +38,7 @@ content:
     third_party_settings: {  }
   accessibility_phone:
     type: readonly_field_widget
-    weight: 11
+    weight: 13
     region: content
     settings:
       label: above
@@ -46,7 +48,7 @@ content:
     third_party_settings: {  }
   accessibility_www:
     type: readonly_field_widget
-    weight: 17
+    weight: 19
     region: content
     settings:
       label: above
@@ -56,7 +58,7 @@ content:
     third_party_settings: {  }
   address:
     type: readonly_field_widget
-    weight: 20
+    weight: 22
     region: content
     settings:
       label: above
@@ -66,7 +68,7 @@ content:
     third_party_settings: {  }
   address_postal:
     type: readonly_field_widget
-    weight: 21
+    weight: 24
     region: content
     settings:
       label: above
@@ -76,7 +78,7 @@ content:
     third_party_settings: {  }
   call_charge_info:
     type: readonly_field_widget
-    weight: 20
+    weight: 23
     region: content
     settings:
       label: above
@@ -86,7 +88,7 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    weight: 39
+    weight: 43
     region: content
     settings:
       label: above
@@ -96,7 +98,7 @@ content:
     third_party_settings: {  }
   description:
     type: readonly_field_widget
-    weight: 18
+    weight: 20
     region: content
     settings:
       label: above
@@ -106,7 +108,7 @@ content:
     third_party_settings: {  }
   email:
     type: readonly_field_widget
-    weight: 10
+    weight: 12
     region: content
     settings:
       label: above
@@ -116,7 +118,7 @@ content:
     third_party_settings: {  }
   enrich_description:
     type: text_textarea
-    weight: 19
+    weight: 21
     region: content
     settings:
       rows: 5
@@ -127,7 +129,7 @@ content:
         hide_guidelines: '1'
   field_content:
     type: paragraphs
-    weight: 28
+    weight: 31
     region: content
     settings:
       title: Paragraph
@@ -146,7 +148,7 @@ content:
     third_party_settings: {  }
   field_lower_content:
     type: paragraphs
-    weight: 29
+    weight: 33
     region: content
     settings:
       title: Paragraph
@@ -165,15 +167,30 @@ content:
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 27
+    weight: 30
     region: content
     settings:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_phone_label:
+    type: string_textfield
+    weight: 11
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_phone_with_contacts:
+    type: boolean_checkbox
+    weight: 10
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
-    weight: 30
+    weight: 34
     region: content
     settings:
       match_operator: CONTAINS
@@ -183,14 +200,14 @@ content:
     third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
-    weight: 31
+    weight: 35
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    weight: 36
+    weight: 40
     region: content
     settings:
       label: above
@@ -207,7 +224,7 @@ content:
     third_party_settings: {  }
   latitude:
     type: readonly_field_widget
-    weight: 22
+    weight: 25
     region: content
     settings:
       label: above
@@ -217,7 +234,7 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    weight: 33
+    weight: 37
     region: content
     settings:
       label: above
@@ -227,7 +244,7 @@ content:
     third_party_settings: {  }
   longitude:
     type: readonly_field_widget
-    weight: 23
+    weight: 26
     region: content
     settings:
       label: above
@@ -255,7 +272,7 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    weight: 35
+    weight: 39
     region: content
     settings:
       label: above
@@ -265,7 +282,7 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    weight: 37
+    weight: 41
     region: content
     settings:
       label: above
@@ -275,7 +292,7 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 16
+    weight: 18
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -308,7 +325,7 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    weight: 38
+    weight: 42
     region: content
     settings:
       label: above
@@ -318,7 +335,7 @@ content:
     third_party_settings: {  }
   provided_languages:
     type: readonly_field_widget
-    weight: 32
+    weight: 36
     region: content
     settings:
       label: above
@@ -328,7 +345,7 @@ content:
     third_party_settings: {  }
   service_map_embed:
     type: readonly_field_widget
-    weight: 25
+    weight: 28
     region: content
     settings:
       label: above
@@ -338,7 +355,7 @@ content:
     third_party_settings: {  }
   services:
     type: readonly_field_widget
-    weight: 26
+    weight: 29
     region: content
     settings:
       label: above
@@ -348,19 +365,19 @@ content:
     third_party_settings: {  }
   show_www:
     type: boolean_checkbox
-    weight: 15
+    weight: 17
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 14
+    weight: 16
     region: content
     settings: {  }
     third_party_settings: {  }
   streetview_entrance_url:
     type: readonly_field_widget
-    weight: 24
+    weight: 27
     region: content
     settings:
       label: above
@@ -385,7 +402,7 @@ content:
     third_party_settings: {  }
   topical:
     type: readonly_field_widget
-    weight: 34
+    weight: 38
     region: content
     settings:
       label: above
@@ -408,7 +425,7 @@ content:
     third_party_settings: {  }
   www:
     type: readonly_field_widget
-    weight: 13
+    weight: 15
     region: content
     settings:
       label: above
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index 09c973d7..b1b325a9 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -6,6 +6,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
@@ -18,7 +20,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: 8GmiJoVZmgbZpZ9jGuNv_AQg3EgThOq06AsznzuWOGk
+  default_config_hash: KKLuQo4x7W4plteNKkenZDXlAFJZq_JIKLNpkVpMvY0
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -134,6 +136,24 @@ content:
     third_party_settings: {  }
     weight: 17
     region: content
+  field_phone_label:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 31
+    region: content
+  field_phone_with_contacts:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 33
+    region: content
   highlights:
     type: tpr_connection
     label: hidden
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
index 235e52d2..e18b21f5 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -7,12 +7,14 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
     - address
     - helfi_tpr
 _core:
-  default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
+  default_config_hash: hyQdtfnFAHflVh30neHIGf5Q1EQKwQ6Fh8L40BGc6Q4
 id: tpr_unit.tpr_unit.minimal
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -56,6 +58,8 @@ hidden:
   field_content: true
   field_lower_content: true
   field_metatags: true
+  field_phone_label: true
+  field_phone_with_contacts: true
   field_unit_type: true
   hide_description: true
   highlights: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
index 71d03ad2..71286c95 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
@@ -14,7 +16,7 @@ dependencies:
     - helfi_tpr
     - imagecache_external
 _core:
-  default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ
+  default_config_hash: bu1vbWjYc7PTOP7denJmdFWv2Zxqx4AW3vn1SI8bTBE
 id: tpr_unit.tpr_unit.teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -76,6 +78,8 @@ hidden:
   field_content: true
   field_lower_content: true
   field_metatags: true
+  field_phone_label: true
+  field_phone_with_contacts: true
   field_unit_type: true
   hide_description: true
   highlights: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
index f24cc2e3..60216c73 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
@@ -15,7 +17,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4
+  default_config_hash: McJz2HeaXm4Y5NdPeFwbANVbhm0Gkt4cWqbbUqxkUfg
 id: tpr_unit.tpr_unit.teaser_with_image
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -77,6 +79,8 @@ hidden:
   field_content: true
   field_lower_content: true
   field_metatags: true
+  field_phone_label: true
+  field_phone_with_contacts: true
   field_unit_type: true
   hide_description: true
   highlights: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
index 9e59c9ef..3757c5d3 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_content
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
@@ -15,7 +17,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc
+  default_config_hash: 4JVDtiNxzY2SrNjrfQQb9FqiK5AqDROxV5xrIRT9iYs
 id: tpr_unit.tpr_unit.wide_teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -92,6 +94,8 @@ hidden:
   field_content: true
   field_lower_content: true
   field_metatags: true
+  field_phone_label: true
+  field_phone_with_contacts: true
   field_unit_type: true
   hide_description: true
   highlights: true
diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_label.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_label.yml
new file mode 100644
index 00000000..14504641
--- /dev/null
+++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_label.yml
@@ -0,0 +1,22 @@
+uuid: 1d151d93-b47d-473e-9800-6bef3ff31a4c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.tpr_unit.field_phone_label
+  module:
+    - helfi_tpr
+_core:
+  default_config_hash: 5ijk9KdGolEgNPeoYmIMlnwrI6wJAQfHu08OHlHckN4
+id: tpr_unit.tpr_unit.field_phone_label
+field_name: field_phone_label
+entity_type: tpr_unit
+bundle: tpr_unit
+label: 'Phone label'
+description: 'The label shown above the phone number when displayed in other contact info accordion.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
new file mode 100644
index 00000000..165e693d
--- /dev/null
+++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
@@ -0,0 +1,24 @@
+uuid: 6d9eca3f-181b-419e-b0b5-9d45d376576f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.tpr_unit.field_phone_with_contacts
+  module:
+    - helfi_tpr
+_core:
+  default_config_hash: AXcmj8wraE-UrpOeBiH55uLJpvqjNVRCf321pJ9ZubA
+id: tpr_unit.tpr_unit.field_phone_with_contacts
+field_name: field_phone_with_contacts
+entity_type: tpr_unit
+bundle: tpr_unit
+label: 'Move phone to Other contact information accordion'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/conf/cmi/field.storage.tpr_unit.field_phone_label.yml b/conf/cmi/field.storage.tpr_unit.field_phone_label.yml
new file mode 100644
index 00000000..d7bb436d
--- /dev/null
+++ b/conf/cmi/field.storage.tpr_unit.field_phone_label.yml
@@ -0,0 +1,23 @@
+uuid: 5ceecd2f-a3a9-4ee5-a497-e91f998cac60
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+_core:
+  default_config_hash: bdXSQZcGkS6_J3c6BumdPW4kvZ-H0jNRuwaUAyXIQuU
+id: tpr_unit.field_phone_label
+field_name: field_phone_label
+entity_type: tpr_unit
+type: string
+settings:
+  max_length: 255
+  case_sensitive: false
+  is_ascii: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/field.storage.tpr_unit.field_phone_with_contacts.yml b/conf/cmi/field.storage.tpr_unit.field_phone_with_contacts.yml
new file mode 100644
index 00000000..4c98ae46
--- /dev/null
+++ b/conf/cmi/field.storage.tpr_unit.field_phone_with_contacts.yml
@@ -0,0 +1,20 @@
+uuid: 150332b7-7b7a-457e-9a71-b43876952ba8
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+_core:
+  default_config_hash: Z5euVzAZ4XcwEx6WQUKgUx6f3g24x5I-wePBh22ZLLo
+id: tpr_unit.field_phone_with_contacts
+field_name: field_phone_with_contacts
+entity_type: tpr_unit
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_label.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_label.yml
new file mode 100644
index 00000000..89542105
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_label.yml
@@ -0,0 +1,2 @@
+label: 'Yhteystiedon nimi'
+description: 'Kirjoita puhelinnumeron ylläpuolella näytettävä nimi.'
diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
new file mode 100644
index 00000000..f2e1b2f6
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
@@ -0,0 +1,4 @@
+label: 'Siirrä puhelinnumero Muut yhteystiedot -haitariin'
+settings:
+  on_label: Kyllä
+  off_label: Ei
diff --git a/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
new file mode 100644
index 00000000..83c1e838
--- /dev/null
+++ b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_phone_with_contacts.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: Ja
+  off_label: Nej
diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml
index fae50e68..44c16dfb 100644
--- a/conf/cmi/user.role.admin.yml
+++ b/conf/cmi/user.role.admin.yml
@@ -78,7 +78,6 @@ permissions:
   - 'administer tpr_unit'
   - 'administer url aliases'
   - 'administer users'
-  - 'assign admin role'
   - 'assign content_producer role'
   - 'assign editor role'
   - 'assign read_only role'