Merging develop into main

composer.json

@@ -48,7 +48,7 @@
         "drupal/address": "^1.8",
         "drupal/admin_toolbar": "^3.0",
         "drupal/antibot": "^1.4",
-        "drupal/block_class": "^1.2",
+        "drupal/block_class": "^1.2||^2.0",
         "drupal/coffee": "^1.0",
         "drupal/colorbox": "^1.6 | ^2.0",
         "drupal/config_auto_export": "^2.0",
@@ -72,11 +72,11 @@
         "drupal/recaptcha": "^3.0",
         "drupal/redis": "^1.4",
         "drupal/security_review": "1.x-dev",
-        "drupal/simple_sitemap": "^3.6",
+        "drupal/simple_sitemap": "^4.1",
         "drupal/sitemap": "^2.0",
         "drupal/smart_date": "^3.1",
         "drupal/smtp": "^1.0",
-        "drupal/stage_file_proxy": "^1.1",
+        "drupal/stage_file_proxy": "^1.1||^2.0",
         "drupal/subpathauto": "^1.1",
         "drupal/token": "^1.7",
         "drupal/unlimited_number": "^2.0",