Merge branch 'develop' into 'main'

Merging develop into main

See merge request !92

ahoy.current.yml

@@ -6,6 +6,8 @@ commands:
       drush @default.dev cr
       SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
       if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:deactivate live --force
+        drush -y @default.dev config-split:deactivate test --force
         drush -y @default.dev config-split:import develop
       fi
       download files ${PROJECT_BRANCH}
@@ -18,6 +20,8 @@ commands:
       drush @default.dev cr
       SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
       if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:deactivate live --force
+        drush -y @default.dev config-split:deactivate test --force
         drush -y @default.dev config-split:import develop
       fi
     usage: Pull DB from live site

ahoy.live.yml

@@ -6,6 +6,8 @@ commands:
       drush @default.dev cr
       SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
       if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:deactivate live --force
+        drush -y @default.dev config-split:deactivate test --force
         drush -y @default.dev config-split:import develop
       fi
       download files main
@@ -18,6 +20,8 @@ commands:
       drush @default.dev cr
       SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
       if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:deactivate live --force
+        drush -y @default.dev config-split:deactivate test --force
         drush -y @default.dev config-split:import develop
       fi
     usage: Pull DB from live site