Add mixed version testing for the deps/rabbit suites

Mix clusters with v3.7 and v3.8, currently on both erlang versions. As
this also increases the actions duration rabbit ct-* suites have been
de-grouped such that multiple ct suites are no longer run as part of a
GitHub Actions job.

14 files changed, 10689 insertions, 1235 deletions

diff --git a/.github/workflows/base-images.yaml b/.github/workflows/base-images.yaml
index e5fc803082..ea670b73f5 100644
--- a/.github/workflows/base-images.yaml
+++ b/.github/workflows/base-images.yaml
@@ -1,4 +1,4 @@
-name: Base Images
+name: Workflow Base Images
 on:
 - workflow_dispatch
 jobs:
@@ -8,14 +8,24 @@ jobs:
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-    - name: CREATE BASE CI IMAGE
+    - name: CREATE ERLANG+ELIXIR IMAGE (22.3)
+      uses: docker/build-push-action@v1
+      with:
+        username: _json_key
+        password: ${{ secrets.GCR_JSON_KEY }}
+        registry: eu.gcr.io
+        repository: cf-rabbitmq-core/erlang_elixir
+        dockerfile: ci/dockerfiles/22.3/erlang_elixir
+        tags: "22.3"
+    - name: CREATE BASE CI IMAGE (22.3)
       uses: docker/build-push-action@v1
       with:
         username: _json_key
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci-base
-        dockerfile: ci/dockerfiles/22.3/base
+        dockerfile: ci/dockerfiles/ci-base
+        build_args: ERLANG_VERSION=22.3,SECONDARY_UMBRELLA_GITREFS=v3.7.28 v3.8.9
         tags: "22.3"
   ci-base-23_1:
     name: ci-base-23_1
@@ -23,12 +33,22 @@ jobs:
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-    - name: CREATE BASE CI IMAGE
+    - name: CREATE ERLANG+ELIXIR IMAGE (23.1)
+      uses: docker/build-push-action@v1
+      with:
+        username: _json_key
+        password: ${{ secrets.GCR_JSON_KEY }}
+        registry: eu.gcr.io
+        repository: cf-rabbitmq-core/erlang_elixir
+        dockerfile: ci/dockerfiles/23.1/erlang_elixir
+        tags: "23.1"
+    - name: CREATE BASE CI IMAGE (23.1)
       uses: docker/build-push-action@v1
       with:
         username: _json_key
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci-base
-        dockerfile: ci/dockerfiles/23.1/base
+        dockerfile: ci/dockerfiles/ci-base
+        build_args: ERLANG_VERSION=23.1,SECONDARY_UMBRELLA_GITREFS=v3.7.28 v3.8.9
         tags: "23.1"
diff --git a/.github/workflows/test-erlang-otp-22.3.yaml b/.github/workflows/test-erlang-otp-22.3.yaml
index 77768226db..7a34c2c1d4 100644
--- a/.github/workflows/test-erlang-otp-22.3.yaml
+++ b/.github/workflows/test-erlang-otp-22.3.yaml
@@ -542,8 +542,8 @@ jobs:
         dockerfile: ci/dockerfiles/ci-dep
         build_args: IMAGE_TAG=erlang-22.3-rabbitmq-${{ github.sha }},BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }},project=rabbit
         tags: erlang-22.3-rabbitmq-${{ github.sha }}
-  rabbit-ct-rabbit_confirms-plus-16-more:
-    name: rabbit-ct-rabbit_confirms-plus-16-more
+  rabbit-ct-amqqueue_backward_compatibility:
+    name: rabbit-ct-amqqueue_backward_compatibility
     needs:
     - prepare
     - rabbit-checks
@@ -557,297 +557,1149 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-rabbit_confirms
+    - name: RUN ct-amqqueue_backward_compatibility
       run: |
-        mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
+        mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_confirms \
+          --env CT_SUITE=amqqueue_backward_compatibility \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_confirms-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_confirms-logs
-        path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_msg_record
+        name: rabbit-ct-amqqueue_backward_compatibility-logs
+        path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-amqqueue_backward_compatibility [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
+        mkdir ct-amqqueue_backward_compatibility-logs-v3.7.28 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_msg_record \
+          --env CT_SUITE=amqqueue_backward_compatibility \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_msg_record-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.7.28
+        path: ct-amqqueue_backward_compatibility-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-amqqueue_backward_compatibility [mixed v3.8.9]
+      run: |
+        mkdir ct-amqqueue_backward_compatibility-logs-v3.8.9 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=amqqueue_backward_compatibility \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.8.9
+        path: ct-amqqueue_backward_compatibility-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-backing_queue:
+    name: rabbit-ct-backing_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-backing_queue
+      run: |
+        mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=backing_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-backing_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_msg_record-logs
-        path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo_v0
+        name: rabbit-ct-backing_queue-logs
+        path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-backing_queue [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
+        mkdir ct-backing_queue-logs-v3.7.28 && chmod 777 ct-backing_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo_v0 \
+          --env CT_SUITE=backing_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo_v0-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-backing_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-backing_queue-logs-mixed-v3.7.28
+        path: ct-backing_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-backing_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-backing_queue-logs-v3.8.9 && chmod 777 ct-backing_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=backing_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-backing_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-backing_queue-logs-mixed-v3.8.9
+        path: ct-backing_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-channel_interceptor:
+    name: rabbit-ct-channel_interceptor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-channel_interceptor
+      run: |
+        mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_interceptor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-channel_interceptor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo_v0-logs
-        path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_connection_tracking
+        name: rabbit-ct-channel_interceptor-logs
+        path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_interceptor [mixed v3.7.28]
       run: |
-        mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
+        mkdir ct-channel_interceptor-logs-v3.7.28 && chmod 777 ct-channel_interceptor-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_connection_tracking \
+          --env CT_SUITE=channel_interceptor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_connection_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-channel_interceptor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_interceptor-logs-mixed-v3.7.28
+        path: ct-channel_interceptor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_interceptor [mixed v3.8.9]
+      run: |
+        mkdir ct-channel_interceptor-logs-v3.8.9 && chmod 777 ct-channel_interceptor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_interceptor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-channel_interceptor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_interceptor-logs-mixed-v3.8.9
+        path: ct-channel_interceptor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-channel_operation_timeout:
+    name: rabbit-ct-channel_operation_timeout
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-channel_operation_timeout
+      run: |
+        mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_operation_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-channel_operation_timeout-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_connection_tracking-logs
-        path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_plugin_directories
+        name: rabbit-ct-channel_operation_timeout-logs
+        path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_operation_timeout [mixed v3.7.28]
       run: |
-        mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
+        mkdir ct-channel_operation_timeout-logs-v3.7.28 && chmod 777 ct-channel_operation_timeout-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_plugin_directories \
+          --env CT_SUITE=channel_operation_timeout \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_plugin_directories-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-channel_operation_timeout-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.7.28
+        path: ct-channel_operation_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_operation_timeout [mixed v3.8.9]
+      run: |
+        mkdir ct-channel_operation_timeout-logs-v3.8.9 && chmod 777 ct-channel_operation_timeout-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_operation_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-channel_operation_timeout-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.8.9
+        path: ct-channel_operation_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-cluster:
+    name: rabbit-ct-cluster
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-cluster
+      run: |
+        mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-cluster-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_plugin_directories-logs
-        path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_limit_partitions
+        name: rabbit-ct-cluster-logs
+        path: ct-cluster-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
+        mkdir ct-cluster-logs-v3.7.28 && chmod 777 ct-cluster-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env CT_SUITE=cluster \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-cluster-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster-logs-mixed-v3.7.28
+        path: ct-cluster-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster [mixed v3.8.9]
+      run: |
+        mkdir ct-cluster-logs-v3.8.9 && chmod 777 ct-cluster-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-cluster-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster-logs-mixed-v3.8.9
+        path: ct-cluster-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-cluster_rename:
+    name: rabbit-ct-cluster_rename
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-cluster_rename
+      run: |
+        mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster_rename \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-cluster_rename-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
-        path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-queue_type
+        name: rabbit-ct-cluster_rename-logs
+        path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster_rename [mixed v3.7.28]
       run: |
-        mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
+        mkdir ct-cluster_rename-logs-v3.7.28 && chmod 777 ct-cluster_rename-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_type \
+          --env CT_SUITE=cluster_rename \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_type-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-cluster_rename-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster_rename-logs-mixed-v3.7.28
+        path: ct-cluster_rename-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster_rename [mixed v3.8.9]
+      run: |
+        mkdir ct-cluster_rename-logs-v3.8.9 && chmod 777 ct-cluster_rename-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster_rename \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-cluster_rename-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster_rename-logs-mixed-v3.8.9
+        path: ct-cluster_rename-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-clustering_management:
+    name: rabbit-ct-clustering_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-clustering_management
+      run: |
+        mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=clustering_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-clustering_management-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_type-logs
-        path: ct-queue_type-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_cluster_formation_locking_mocks
+        name: rabbit-ct-clustering_management-logs
+        path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-clustering_management [mixed v3.7.28]
       run: |
-        mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
+        mkdir ct-clustering_management-logs-v3.7.28 && chmod 777 ct-clustering_management-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env CT_SUITE=clustering_management \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-clustering_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-clustering_management-logs-mixed-v3.7.28
+        path: ct-clustering_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-clustering_management [mixed v3.8.9]
+      run: |
+        mkdir ct-clustering_management-logs-v3.8.9 && chmod 777 ct-clustering_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=clustering_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-clustering_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-clustering_management-logs-mixed-v3.8.9
+        path: ct-clustering_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-config_schema:
+    name: rabbit-ct-config_schema
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-config_schema
+      run: |
+        mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=config_schema \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-config_schema-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
-        path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_collections
+        name: rabbit-ct-config_schema-logs
+        path: ct-config_schema-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-config_schema [mixed v3.7.28]
       run: |
-        mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
+        mkdir ct-config_schema-logs-v3.7.28 && chmod 777 ct-config_schema-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_collections \
+          --env CT_SUITE=config_schema \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_collections-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-config_schema-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-config_schema-logs-mixed-v3.7.28
+        path: ct-config_schema-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-config_schema [mixed v3.8.9]
+      run: |
+        mkdir ct-config_schema-logs-v3.8.9 && chmod 777 ct-config_schema-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=config_schema \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-config_schema-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-config_schema-logs-mixed-v3.8.9
+        path: ct-config_schema-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-confirms_rejects:
+    name: rabbit-ct-confirms_rejects
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-confirms_rejects
+      run: |
+        mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=confirms_rejects \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-confirms_rejects-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_collections-logs
-        path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-amqqueue_backward_compatibility
+        name: rabbit-ct-confirms_rejects-logs
+        path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-confirms_rejects [mixed v3.7.28]
       run: |
-        mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
+        mkdir ct-confirms_rejects-logs-v3.7.28 && chmod 777 ct-confirms_rejects-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=amqqueue_backward_compatibility \
+          --env CT_SUITE=confirms_rejects \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-confirms_rejects-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-confirms_rejects-logs-mixed-v3.7.28
+        path: ct-confirms_rejects-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-confirms_rejects [mixed v3.8.9]
+      run: |
+        mkdir ct-confirms_rejects-logs-v3.8.9 && chmod 777 ct-confirms_rejects-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=confirms_rejects \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-confirms_rejects-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-confirms_rejects-logs-mixed-v3.8.9
+        path: ct-confirms_rejects-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-consumer_timeout:
+    name: rabbit-ct-consumer_timeout
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-consumer_timeout
+      run: |
+        mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=consumer_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-consumer_timeout-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-amqqueue_backward_compatibility-logs
-        path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-msg_store
+        name: rabbit-ct-consumer_timeout-logs
+        path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-consumer_timeout [mixed v3.7.28]
       run: |
-        mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
+        mkdir ct-consumer_timeout-logs-v3.7.28 && chmod 777 ct-consumer_timeout-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=msg_store \
+          --env CT_SUITE=consumer_timeout \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-msg_store-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-consumer_timeout-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-consumer_timeout-logs-mixed-v3.7.28
+        path: ct-consumer_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-consumer_timeout [mixed v3.8.9]
+      run: |
+        mkdir ct-consumer_timeout-logs-v3.8.9 && chmod 777 ct-consumer_timeout-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=consumer_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-consumer_timeout-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-consumer_timeout-logs-mixed-v3.8.9
+        path: ct-consumer_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-crashing_queues:
+    name: rabbit-ct-crashing_queues
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-crashing_queues
+      run: |
+        mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=crashing_queues \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-crashing_queues-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-msg_store-logs
-        path: ct-msg_store-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_gm
+        name: rabbit-ct-crashing_queues-logs
+        path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-crashing_queues [mixed v3.7.28]
       run: |
-        mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
+        mkdir ct-crashing_queues-logs-v3.7.28 && chmod 777 ct-crashing_queues-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_gm \
+          --env CT_SUITE=crashing_queues \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_gm-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-crashing_queues-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-crashing_queues-logs-mixed-v3.7.28
+        path: ct-crashing_queues-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-crashing_queues [mixed v3.8.9]
+      run: |
+        mkdir ct-crashing_queues-logs-v3.8.9 && chmod 777 ct-crashing_queues-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=crashing_queues \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-crashing_queues-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-crashing_queues-logs-mixed-v3.8.9
+        path: ct-crashing_queues-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dead_lettering:
+    name: rabbit-ct-dead_lettering
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dead_lettering
+      run: |
+        mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dead_lettering \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dead_lettering-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_gm-logs
-        path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_msg_store
+        name: rabbit-ct-dead_lettering-logs
+        path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dead_lettering [mixed v3.7.28]
       run: |
-        mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
+        mkdir ct-dead_lettering-logs-v3.7.28 && chmod 777 ct-dead_lettering-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_msg_store \
+          --env CT_SUITE=dead_lettering \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_msg_store-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dead_lettering-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dead_lettering-logs-mixed-v3.7.28
+        path: ct-dead_lettering-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dead_lettering [mixed v3.8.9]
+      run: |
+        mkdir ct-dead_lettering-logs-v3.8.9 && chmod 777 ct-dead_lettering-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dead_lettering \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dead_lettering-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dead_lettering-logs-mixed-v3.8.9
+        path: ct-dead_lettering-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-definition_import:
+    name: rabbit-ct-definition_import
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-definition_import
+      run: |
+        mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=definition_import \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-definition_import-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_msg_store-logs
-        path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-term_to_binary_compat_prop
+        name: rabbit-ct-definition_import-logs
+        path: ct-definition_import-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-definition_import [mixed v3.7.28]
       run: |
-        mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
+        mkdir ct-definition_import-logs-v3.7.28 && chmod 777 ct-definition_import-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=term_to_binary_compat_prop \
+          --env CT_SUITE=definition_import \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-term_to_binary_compat_prop-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-definition_import-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-definition_import-logs-mixed-v3.7.28
+        path: ct-definition_import-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-definition_import [mixed v3.8.9]
+      run: |
+        mkdir ct-definition_import-logs-v3.8.9 && chmod 777 ct-definition_import-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=definition_import \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-definition_import-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-definition_import-logs-mixed-v3.8.9
+        path: ct-definition_import-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-disconnect_detected_during_alarm:
+    name: rabbit-ct-disconnect_detected_during_alarm
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-disconnect_detected_during_alarm
+      run: |
+        mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-term_to_binary_compat_prop-logs
-        path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_operator_policy
+        name: rabbit-ct-disconnect_detected_during_alarm-logs
+        path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-disconnect_detected_during_alarm [mixed v3.7.28]
       run: |
-        mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
+        mkdir ct-disconnect_detected_during_alarm-logs-v3.7.28 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_operator_policy \
+          --env CT_SUITE=disconnect_detected_during_alarm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_operator_policy-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.7.28
+        path: ct-disconnect_detected_during_alarm-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-disconnect_detected_during_alarm [mixed v3.8.9]
+      run: |
+        mkdir ct-disconnect_detected_during_alarm-logs-v3.8.9 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.8.9
+        path: ct-disconnect_detected_during_alarm-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dynamic_ha:
+    name: rabbit-ct-dynamic_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dynamic_ha
+      run: |
+        mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dynamic_ha-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_operator_policy-logs
-        path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmqctl_shutdown
+        name: rabbit-ct-dynamic_ha-logs
+        path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_ha [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
+        mkdir ct-dynamic_ha-logs-v3.7.28 && chmod 777 ct-dynamic_ha-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env CT_SUITE=dynamic_ha \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dynamic_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_ha-logs-mixed-v3.7.28
+        path: ct-dynamic_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-dynamic_ha-logs-v3.8.9 && chmod 777 ct-dynamic_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dynamic_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_ha-logs-mixed-v3.8.9
+        path: ct-dynamic_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dynamic_qq:
+    name: rabbit-ct-dynamic_qq
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dynamic_qq
+      run: |
+        mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_qq \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dynamic_qq-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmqctl_shutdown-logs
-        path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_amqp091_content_framing
+        name: rabbit-ct-dynamic_qq-logs
+        path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_qq [mixed v3.7.28]
       run: |
-        mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
+        mkdir ct-dynamic_qq-logs-v3.7.28 && chmod 777 ct-dynamic_qq-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_amqp091_content_framing \
+          --env CT_SUITE=dynamic_qq \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_amqp091_content_framing-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dynamic_qq-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_qq-logs-mixed-v3.7.28
+        path: ct-dynamic_qq-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_qq [mixed v3.8.9]
+      run: |
+        mkdir ct-dynamic_qq-logs-v3.8.9 && chmod 777 ct-dynamic_qq-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_qq \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dynamic_qq-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_qq-logs-mixed-v3.8.9
+        path: ct-dynamic_qq-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-eager_sync:
+    name: rabbit-ct-eager_sync
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-eager_sync
+      run: |
+        mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-eager_sync-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_amqp091_content_framing-logs
-        path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-unit_pg_local-plus-11-more:
-    name: rabbit-ct-unit_pg_local-plus-11-more
+        name: rabbit-ct-eager_sync-logs
+        path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-eager_sync [mixed v3.7.28]
+      run: |
+        mkdir ct-eager_sync-logs-v3.7.28 && chmod 777 ct-eager_sync-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-eager_sync-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-eager_sync-logs-mixed-v3.7.28
+        path: ct-eager_sync-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-eager_sync [mixed v3.8.9]
+      run: |
+        mkdir ct-eager_sync-logs-v3.8.9 && chmod 777 ct-eager_sync-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-eager_sync-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-eager_sync-logs-mixed-v3.8.9
+        path: ct-eager_sync-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-feature_flags:
+    name: rabbit-ct-feature_flags
     needs:
     - prepare
     - rabbit-checks
@@ -861,159 +1713,754 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-unit_pg_local
+    - name: RUN ct-feature_flags
       run: |
-        mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
+        mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_pg_local \
+          --env CT_SUITE=feature_flags \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_pg_local-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-feature_flags-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_pg_local-logs
-        path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_policy_validators
+        name: rabbit-ct-feature_flags-logs
+        path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-feature_flags [mixed v3.7.28]
       run: |
-        mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
+        mkdir ct-feature_flags-logs-v3.7.28 && chmod 777 ct-feature_flags-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_policy_validators \
+          --env CT_SUITE=feature_flags \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_policy_validators-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-feature_flags-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-feature_flags-logs-mixed-v3.7.28
+        path: ct-feature_flags-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-feature_flags [mixed v3.8.9]
+      run: |
+        mkdir ct-feature_flags-logs-v3.8.9 && chmod 777 ct-feature_flags-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=feature_flags \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-feature_flags-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-feature_flags-logs-mixed-v3.8.9
+        path: ct-feature_flags-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-lazy_queue:
+    name: rabbit-ct-lazy_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-lazy_queue
+      run: |
+        mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=lazy_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-lazy_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_policy_validators-logs
-        path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_limit
+        name: rabbit-ct-lazy_queue-logs
+        path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-lazy_queue [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
+        mkdir ct-lazy_queue-logs-v3.7.28 && chmod 777 ct-lazy_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_limit \
+          --env CT_SUITE=lazy_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_limit-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-lazy_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-lazy_queue-logs-mixed-v3.7.28
+        path: ct-lazy_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-lazy_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-lazy_queue-logs-v3.8.9 && chmod 777 ct-lazy_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=lazy_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-lazy_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-lazy_queue-logs-mixed-v3.8.9
+        path: ct-lazy_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-list_consumers_sanity_check:
+    name: rabbit-ct-list_consumers_sanity_check
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-list_consumers_sanity_check
+      run: |
+        mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_consumers_sanity_check \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_limit-logs
-        path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_plugin_versioning
+        name: rabbit-ct-list_consumers_sanity_check-logs
+        path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_consumers_sanity_check [mixed v3.7.28]
       run: |
-        mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
+        mkdir ct-list_consumers_sanity_check-logs-v3.7.28 && chmod 777 ct-list_consumers_sanity_check-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_plugin_versioning \
+          --env CT_SUITE=list_consumers_sanity_check \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_plugin_versioning-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.7.28
+        path: ct-list_consumers_sanity_check-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_consumers_sanity_check [mixed v3.8.9]
+      run: |
+        mkdir ct-list_consumers_sanity_check-logs-v3.8.9 && chmod 777 ct-list_consumers_sanity_check-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_consumers_sanity_check \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.8.9
+        path: ct-list_consumers_sanity_check-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-list_queues_online_and_offline:
+    name: rabbit-ct-list_queues_online_and_offline
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-list_queues_online_and_offline
+      run: |
+        mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_queues_online_and_offline \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_plugin_versioning-logs
-        path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_priority_queue
+        name: rabbit-ct-list_queues_online_and_offline-logs
+        path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_queues_online_and_offline [mixed v3.7.28]
       run: |
-        mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
+        mkdir ct-list_queues_online_and_offline-logs-v3.7.28 && chmod 777 ct-list_queues_online_and_offline-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_priority_queue \
+          --env CT_SUITE=list_queues_online_and_offline \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_priority_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.7.28
+        path: ct-list_queues_online_and_offline-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_queues_online_and_offline [mixed v3.8.9]
+      run: |
+        mkdir ct-list_queues_online_and_offline-logs-v3.8.9 && chmod 777 ct-list_queues_online_and_offline-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_queues_online_and_offline \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.8.9
+        path: ct-list_queues_online_and_offline-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-maintenance_mode:
+    name: rabbit-ct-maintenance_mode
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-maintenance_mode
+      run: |
+        mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=maintenance_mode \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-maintenance_mode-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_priority_queue-logs
-        path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_supervisor2
+        name: rabbit-ct-maintenance_mode-logs
+        path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-maintenance_mode [mixed v3.7.28]
       run: |
-        mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
+        mkdir ct-maintenance_mode-logs-v3.7.28 && chmod 777 ct-maintenance_mode-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_supervisor2 \
+          --env CT_SUITE=maintenance_mode \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_supervisor2-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-maintenance_mode-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-maintenance_mode-logs-mixed-v3.7.28
+        path: ct-maintenance_mode-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-maintenance_mode [mixed v3.8.9]
+      run: |
+        mkdir ct-maintenance_mode-logs-v3.8.9 && chmod 777 ct-maintenance_mode-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=maintenance_mode \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-maintenance_mode-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-maintenance_mode-logs-mixed-v3.8.9
+        path: ct-maintenance_mode-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-many_node_ha:
+    name: rabbit-ct-many_node_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-many_node_ha
+      run: |
+        mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=many_node_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-many_node_ha-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_supervisor2-logs
-        path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_queue_consumers
+        name: rabbit-ct-many_node_ha-logs
+        path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-many_node_ha [mixed v3.7.28]
       run: |
-        mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
+        mkdir ct-many_node_ha-logs-v3.7.28 && chmod 777 ct-many_node_ha-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_queue_consumers \
+          --env CT_SUITE=many_node_ha \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_queue_consumers-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-many_node_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-many_node_ha-logs-mixed-v3.7.28
+        path: ct-many_node_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-many_node_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-many_node_ha-logs-v3.8.9 && chmod 777 ct-many_node_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=many_node_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-many_node_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-many_node_ha-logs-mixed-v3.8.9
+        path: ct-many_node_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-message_size_limit:
+    name: rabbit-ct-message_size_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-message_size_limit
+      run: |
+        mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=message_size_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-message_size_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_queue_consumers-logs
-        path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_access_control_credential_validation
+        name: rabbit-ct-message_size_limit-logs
+        path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-message_size_limit [mixed v3.7.28]
       run: |
-        mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
+        mkdir ct-message_size_limit-logs-v3.7.28 && chmod 777 ct-message_size_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_access_control_credential_validation \
+          --env CT_SUITE=message_size_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_access_control_credential_validation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-message_size_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-message_size_limit-logs-mixed-v3.7.28
+        path: ct-message_size_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-message_size_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-message_size_limit-logs-v3.8.9 && chmod 777 ct-message_size_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=message_size_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-message_size_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-message_size_limit-logs-mixed-v3.8.9
+        path: ct-message_size_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-metrics:
+    name: rabbit-ct-metrics
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-metrics
+      run: |
+        mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-metrics-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_access_control_credential_validation-logs
-        path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_log_config
+        name: rabbit-ct-metrics-logs
+        path: ct-metrics-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-metrics [mixed v3.7.28]
       run: |
-        mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
+        mkdir ct-metrics-logs-v3.7.28 && chmod 777 ct-metrics-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_log_config \
+          --env CT_SUITE=metrics \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_log_config-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-metrics-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-metrics-logs-mixed-v3.7.28
+        path: ct-metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-metrics [mixed v3.8.9]
+      run: |
+        mkdir ct-metrics-logs-v3.8.9 && chmod 777 ct-metrics-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-metrics-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-metrics-logs-mixed-v3.8.9
+        path: ct-metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-mirrored_supervisor:
+    name: rabbit-ct-mirrored_supervisor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-mirrored_supervisor
+      run: |
+        mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-mirrored_supervisor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_log_config-logs
-        path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-mirrored_supervisor-logs
+        path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-mirrored_supervisor [mixed v3.7.28]
+      run: |
+        mkdir ct-mirrored_supervisor-logs-v3.7.28 && chmod 777 ct-mirrored_supervisor-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-mirrored_supervisor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.7.28
+        path: ct-mirrored_supervisor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-mirrored_supervisor [mixed v3.8.9]
+      run: |
+        mkdir ct-mirrored_supervisor-logs-v3.8.9 && chmod 777 ct-mirrored_supervisor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-mirrored_supervisor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.8.9
+        path: ct-mirrored_supervisor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-msg_store:
+    name: rabbit-ct-msg_store
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-msg_store
+      run: |
+        mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-msg_store-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs
+        path: ct-msg_store-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-msg_store [mixed v3.7.28]
+      run: |
+        mkdir ct-msg_store-logs-v3.7.28 && chmod 777 ct-msg_store-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-msg_store-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs-mixed-v3.7.28
+        path: ct-msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-msg_store [mixed v3.8.9]
+      run: |
+        mkdir ct-msg_store-logs-v3.8.9 && chmod 777 ct-msg_store-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-msg_store-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs-mixed-v3.8.9
+        path: ct-msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-peer_discovery_classic_config:
+    name: rabbit-ct-peer_discovery_classic_config
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-peer_discovery_classic_config
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs
+        path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_classic_config [mixed v3.7.28]
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs-v3.7.28 && chmod 777 ct-peer_discovery_classic_config-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.7.28
+        path: ct-peer_discovery_classic_config-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_classic_config [mixed v3.8.9]
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs-v3.8.9 && chmod 777 ct-peer_discovery_classic_config-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.8.9
+        path: ct-peer_discovery_classic_config-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-peer_discovery_dns:
+    name: rabbit-ct-peer_discovery_dns
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_dns
       run: |
         mkdir ct-peer_discovery_dns-logs && chmod 777 ct-peer_discovery_dns-logs
@@ -1031,42 +2478,180 @@ jobs:
       with:
         name: rabbit-ct-peer_discovery_dns-logs
         path: ct-peer_discovery_dns-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_disk_monitor_mocks
+    - name: RUN ct-peer_discovery_dns [mixed v3.7.28]
       run: |
-        mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
+        mkdir ct-peer_discovery_dns-logs-v3.7.28 && chmod 777 ct-peer_discovery_dns-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_disk_monitor_mocks \
+          --env CT_SUITE=peer_discovery_dns \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-peer_discovery_dns-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.7.28
+        path: ct-peer_discovery_dns-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_dns [mixed v3.8.9]
+      run: |
+        mkdir ct-peer_discovery_dns-logs-v3.8.9 && chmod 777 ct-peer_discovery_dns-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_dns \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-peer_discovery_dns-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.8.9
+        path: ct-peer_discovery_dns-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_limit:
+    name: rabbit-ct-per_user_connection_channel_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_channel_limit
+      run: |
+        mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_disk_monitor_mocks-logs
-        path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-topic_permission
+        name: rabbit-ct-per_user_connection_channel_limit-logs
+        path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit [mixed v3.7.28]
       run: |
-        mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
+        mkdir ct-per_user_connection_channel_limit-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=topic_permission \
+          --env CT_SUITE=per_user_connection_channel_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-topic_permission-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_limit-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_limit_partitions:
+    name: rabbit-ct-per_user_connection_channel_limit_partitions
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_channel_limit_partitions
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-topic_permission-logs
-        path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-message_size_limit-plus-10-more:
-    name: rabbit-ct-message_size_limit-plus-10-more
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
+        path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.7.28]
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_tracking:
+    name: rabbit-ct-per_user_connection_channel_tracking
     needs:
     - prepare
     - rabbit-checks
@@ -1080,195 +2665,741 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-message_size_limit
+    - name: RUN ct-per_user_connection_channel_tracking
       run: |
-        mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
+        mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=message_size_limit \
+          --env CT_SUITE=per_user_connection_channel_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-message_size_limit-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-message_size_limit-logs
-        path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-proxy_protocol
+        name: rabbit-ct-per_user_connection_channel_tracking-logs
+        path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
+        mkdir ct-per_user_connection_channel_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=proxy_protocol \
+          --env CT_SUITE=per_user_connection_channel_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-proxy_protocol-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_tracking [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_tracking:
+    name: rabbit-ct-per_user_connection_tracking
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_tracking
+      run: |
+        mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-proxy_protocol-logs
-        path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-single_active_consumer
+        name: rabbit-ct-per_user_connection_tracking-logs
+        path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
+        mkdir ct-per_user_connection_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=single_active_consumer \
+          --env CT_SUITE=per_user_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-single_active_consumer-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.7.28
+        path: ct-per_user_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_tracking [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_tracking-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.8.9
+        path: ct-per_user_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_connection_limit:
+    name: rabbit-ct-per_vhost_connection_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_connection_limit
+      run: |
+        mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-single_active_consumer-logs
-        path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo
+        name: rabbit-ct-per_vhost_connection_limit-logs
+        path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
+        mkdir ct-per_vhost_connection_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo \
+          --env CT_SUITE=per_vhost_connection_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.7.28
+        path: ct-per_vhost_connection_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_connection_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.8.9
+        path: ct-per_vhost_connection_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_connection_limit_partitions:
+    name: rabbit-ct-per_vhost_connection_limit_partitions
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_connection_limit_partitions
+      run: |
+        mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo-logs
-        path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_app_management
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs
+        path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.7.28]
       run: |
-        mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
+        mkdir ct-per_vhost_connection_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_app_management \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_app_management-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.7.28
+        path: ct-per_vhost_connection_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_connection_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.8.9
+        path: ct-per_vhost_connection_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_msg_store:
+    name: rabbit-ct-per_vhost_msg_store
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_msg_store
+      run: |
+        mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_app_management-logs
-        path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_disk_monitor
+        name: rabbit-ct-per_vhost_msg_store-logs
+        path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_msg_store [mixed v3.7.28]
       run: |
-        mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
+        mkdir ct-per_vhost_msg_store-logs-v3.7.28 && chmod 777 ct-per_vhost_msg_store-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_disk_monitor \
+          --env CT_SUITE=per_vhost_msg_store \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_disk_monitor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.7.28
+        path: ct-per_vhost_msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_msg_store [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_msg_store-logs-v3.8.9 && chmod 777 ct-per_vhost_msg_store-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.8.9
+        path: ct-per_vhost_msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_queue_limit:
+    name: rabbit-ct-per_vhost_queue_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_queue_limit
+      run: |
+        mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_queue_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_disk_monitor-logs
-        path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_gen_server2
+        name: rabbit-ct-per_vhost_queue_limit-logs
+        path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_queue_limit [mixed v3.7.28]
       run: |
-        mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
+        mkdir ct-per_vhost_queue_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_queue_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_gen_server2 \
+          --env CT_SUITE=per_vhost_queue_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_gen_server2-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.7.28
+        path: ct-per_vhost_queue_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_queue_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_queue_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_queue_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_queue_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.8.9
+        path: ct-per_vhost_queue_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-policy:
+    name: rabbit-ct-policy
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-policy
+      run: |
+        mkdir ct-policy-logs && chmod 777 ct-policy-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=policy \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-policy-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_gen_server2-logs
-        path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-config_schema
+        name: rabbit-ct-policy-logs
+        path: ct-policy-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-policy [mixed v3.7.28]
       run: |
-        mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
+        mkdir ct-policy-logs-v3.7.28 && chmod 777 ct-policy-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=config_schema \
+          --env CT_SUITE=policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-config_schema-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-policy-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-policy-logs-mixed-v3.7.28
+        path: ct-policy-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-policy [mixed v3.8.9]
+      run: |
+        mkdir ct-policy-logs-v3.8.9 && chmod 777 ct-policy-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=policy \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-policy-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-policy-logs-mixed-v3.8.9
+        path: ct-policy-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-priority_queue:
+    name: rabbit-ct-priority_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-priority_queue
+      run: |
+        mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-priority_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-config_schema-logs
-        path: ct-config_schema-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_credit_flow
+        name: rabbit-ct-priority_queue-logs
+        path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue [mixed v3.7.28]
       run: |
-        mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
+        mkdir ct-priority_queue-logs-v3.7.28 && chmod 777 ct-priority_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_credit_flow \
+          --env CT_SUITE=priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_credit_flow-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-priority_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue-logs-mixed-v3.7.28
+        path: ct-priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-priority_queue-logs-v3.8.9 && chmod 777 ct-priority_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-priority_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue-logs-mixed-v3.8.9
+        path: ct-priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-priority_queue_recovery:
+    name: rabbit-ct-priority_queue_recovery
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-priority_queue_recovery
+      run: |
+        mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue_recovery \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-priority_queue_recovery-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_credit_flow-logs
-        path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_vm_memory_monitor
+        name: rabbit-ct-priority_queue_recovery-logs
+        path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue_recovery [mixed v3.7.28]
       run: |
-        mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
+        mkdir ct-priority_queue_recovery-logs-v3.7.28 && chmod 777 ct-priority_queue_recovery-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_vm_memory_monitor \
+          --env CT_SUITE=priority_queue_recovery \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_vm_memory_monitor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-priority_queue_recovery-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.7.28
+        path: ct-priority_queue_recovery-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue_recovery [mixed v3.8.9]
+      run: |
+        mkdir ct-priority_queue_recovery-logs-v3.8.9 && chmod 777 ct-priority_queue_recovery-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue_recovery \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-priority_queue_recovery-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.8.9
+        path: ct-priority_queue_recovery-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-product_info:
+    name: rabbit-ct-product_info
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-product_info
+      run: |
+        mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=product_info \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-product_info-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_vm_memory_monitor-logs
-        path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-mirrored_supervisor
+        name: rabbit-ct-product_info-logs
+        path: ct-product_info-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-product_info [mixed v3.7.28]
       run: |
-        mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
+        mkdir ct-product_info-logs-v3.7.28 && chmod 777 ct-product_info-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=mirrored_supervisor \
+          --env CT_SUITE=product_info \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-mirrored_supervisor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-product_info-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-product_info-logs-mixed-v3.7.28
+        path: ct-product_info-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-product_info [mixed v3.8.9]
+      run: |
+        mkdir ct-product_info-logs-v3.8.9 && chmod 777 ct-product_info-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=product_info \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-product_info-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-product_info-logs-mixed-v3.8.9
+        path: ct-product_info-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-proxy_protocol:
+    name: rabbit-ct-proxy_protocol
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-proxy_protocol
+      run: |
+        mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-proxy_protocol-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-mirrored_supervisor-logs
-        path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-definition_import-plus-9-more:
-    name: rabbit-ct-definition_import-plus-9-more
+        name: rabbit-ct-proxy_protocol-logs
+        path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-proxy_protocol [mixed v3.7.28]
+      run: |
+        mkdir ct-proxy_protocol-logs-v3.7.28 && chmod 777 ct-proxy_protocol-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-proxy_protocol-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-proxy_protocol-logs-mixed-v3.7.28
+        path: ct-proxy_protocol-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-proxy_protocol [mixed v3.8.9]
+      run: |
+        mkdir ct-proxy_protocol-logs-v3.8.9 && chmod 777 ct-proxy_protocol-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-proxy_protocol-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-proxy_protocol-logs-mixed-v3.8.9
+        path: ct-proxy_protocol-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-publisher_confirms_parallel:
+    name: rabbit-ct-publisher_confirms_parallel
     needs:
     - prepare
     - rabbit-checks
@@ -1282,23 +3413,74 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-definition_import
+    - name: RUN ct-publisher_confirms_parallel
       run: |
-        mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
+        mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=definition_import \
+          --env CT_SUITE=publisher_confirms_parallel \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-definition_import-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-definition_import-logs
-        path: ct-definition_import-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-publisher_confirms_parallel-logs
+        path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-publisher_confirms_parallel [mixed v3.7.28]
+      run: |
+        mkdir ct-publisher_confirms_parallel-logs-v3.7.28 && chmod 777 ct-publisher_confirms_parallel-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=publisher_confirms_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.7.28
+        path: ct-publisher_confirms_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-publisher_confirms_parallel [mixed v3.8.9]
+      run: |
+        mkdir ct-publisher_confirms_parallel-logs-v3.8.9 && chmod 777 ct-publisher_confirms_parallel-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=publisher_confirms_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.8.9
+        path: ct-publisher_confirms_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_length_limits:
+    name: rabbit-ct-queue_length_limits
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_length_limits
       run: |
         mkdir ct-queue_length_limits-logs && chmod 777 ct-queue_length_limits-logs
@@ -1316,91 +3498,533 @@ jobs:
       with:
         name: rabbit-ct-queue_length_limits-logs
         path: ct-queue_length_limits-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-cluster
+    - name: RUN ct-queue_length_limits [mixed v3.7.28]
       run: |
-        mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
+        mkdir ct-queue_length_limits-logs-v3.7.28 && chmod 777 ct-queue_length_limits-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=cluster \
+          --env CT_SUITE=queue_length_limits \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-cluster-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_length_limits-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_length_limits-logs-mixed-v3.7.28
+        path: ct-queue_length_limits-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_length_limits [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_length_limits-logs-v3.8.9 && chmod 777 ct-queue_length_limits-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_length_limits \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_length_limits-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_length_limits-logs-mixed-v3.8.9
+        path: ct-queue_length_limits-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_master_location:
+    name: rabbit-ct-queue_master_location
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_master_location
+      run: |
+        mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_master_location \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_master_location-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-cluster-logs
-        path: ct-cluster-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-list_queues_online_and_offline
+        name: rabbit-ct-queue_master_location-logs
+        path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_master_location [mixed v3.7.28]
       run: |
-        mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
+        mkdir ct-queue_master_location-logs-v3.7.28 && chmod 777 ct-queue_master_location-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=list_queues_online_and_offline \
+          --env CT_SUITE=queue_master_location \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-list_queues_online_and_offline-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_master_location-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_master_location-logs-mixed-v3.7.28
+        path: ct-queue_master_location-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_master_location [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_master_location-logs-v3.8.9 && chmod 777 ct-queue_master_location-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_master_location \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_master_location-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_master_location-logs-mixed-v3.8.9
+        path: ct-queue_master_location-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_parallel:
+    name: rabbit-ct-queue_parallel
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_parallel
+      run: |
+        mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_parallel-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-list_queues_online_and_offline-logs
-        path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmq_queues_cli_integration
+        name: rabbit-ct-queue_parallel-logs
+        path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_parallel [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
+        mkdir ct-queue_parallel-logs-v3.7.28 && chmod 777 ct-queue_parallel-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env CT_SUITE=queue_parallel \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_parallel-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_parallel-logs-mixed-v3.7.28
+        path: ct-queue_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_parallel [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_parallel-logs-v3.8.9 && chmod 777 ct-queue_parallel-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_parallel-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_parallel-logs-mixed-v3.8.9
+        path: ct-queue_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_type:
+    name: rabbit-ct-queue_type
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_type
+      run: |
+        mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_type \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_type-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmq_queues_cli_integration-logs
-        path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-list_consumers_sanity_check
+        name: rabbit-ct-queue_type-logs
+        path: ct-queue_type-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_type [mixed v3.7.28]
       run: |
-        mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
+        mkdir ct-queue_type-logs-v3.7.28 && chmod 777 ct-queue_type-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=list_consumers_sanity_check \
+          --env CT_SUITE=queue_type \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-list_consumers_sanity_check-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_type-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_type-logs-mixed-v3.7.28
+        path: ct-queue_type-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_type [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_type-logs-v3.8.9 && chmod 777 ct-queue_type-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_type \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_type-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_type-logs-mixed-v3.8.9
+        path: ct-queue_type-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-quorum_queue:
+    name: rabbit-ct-quorum_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-quorum_queue
+      run: |
+        mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=quorum_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-quorum_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-list_consumers_sanity_check-logs
-        path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-policy
+        name: rabbit-ct-quorum_queue-logs
+        path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-quorum_queue [mixed v3.7.28]
       run: |
-        mkdir ct-policy-logs && chmod 777 ct-policy-logs
+        mkdir ct-quorum_queue-logs-v3.7.28 && chmod 777 ct-quorum_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=policy \
+          --env CT_SUITE=quorum_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-policy-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-quorum_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-quorum_queue-logs-mixed-v3.7.28
+        path: ct-quorum_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-quorum_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-quorum_queue-logs-v3.8.9 && chmod 777 ct-quorum_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=quorum_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-quorum_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-quorum_queue-logs-mixed-v3.8.9
+        path: ct-quorum_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_confirms:
+    name: rabbit-ct-rabbit_confirms
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_confirms
+      run: |
+        mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_confirms-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-policy-logs
-        path: ct-policy-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-rabbit_confirms-logs
+        path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_confirms [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_confirms-logs-v3.7.28 && chmod 777 ct-rabbit_confirms-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_confirms-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_confirms-logs-mixed-v3.7.28
+        path: ct-rabbit_confirms-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_confirms [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_confirms-logs-v3.8.9 && chmod 777 ct-rabbit_confirms-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_confirms-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_confirms-logs-mixed-v3.8.9
+        path: ct-rabbit_confirms-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_core_metrics_gc:
+    name: rabbit-ct-rabbit_core_metrics_gc
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_core_metrics_gc
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs
+        path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_core_metrics_gc [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs-v3.7.28 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.7.28
+        path: ct-rabbit_core_metrics_gc-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_core_metrics_gc [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs-v3.8.9 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.8.9
+        path: ct-rabbit_core_metrics_gc-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo:
+    name: rabbit-ct-rabbit_fifo
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo
+      run: |
+        mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs
+        path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_fifo-logs-v3.7.28 && chmod 777 ct-rabbit_fifo-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo-logs-v3.8.9 && chmod 777 ct-rabbit_fifo-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_int:
+    name: rabbit-ct-rabbit_fifo_int
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_int
       run: |
         mkdir ct-rabbit_fifo_int-logs && chmod 777 ct-rabbit_fifo_int-logs
@@ -1418,42 +4042,180 @@ jobs:
       with:
         name: rabbit-ct-rabbit_fifo_int-logs
         path: ct-rabbit_fifo_int-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_access_control_authn_authz_context_propagation
+    - name: RUN ct-rabbit_fifo_int [mixed v3.7.28]
       run: |
-        mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
+        mkdir ct-rabbit_fifo_int-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_int-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env CT_SUITE=rabbit_fifo_int \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_int-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_int-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_int [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_int-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_int-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_int \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_int-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_int-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_prop:
+    name: rabbit-ct-rabbit_fifo_prop
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo_prop
+      run: |
+        mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
-        path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-disconnect_detected_during_alarm
+        name: rabbit-ct-rabbit_fifo_prop-logs
+        path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_prop [mixed v3.7.28]
       run: |
-        mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
+        mkdir ct-rabbit_fifo_prop-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_prop-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env CT_SUITE=rabbit_fifo_prop \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_prop [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_prop-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_prop-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_v0:
+    name: rabbit-ct-rabbit_fifo_v0
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo_v0
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-disconnect_detected_during_alarm-logs
-        path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-unit_stats_and_metrics-plus-8-more:
-    name: rabbit-ct-unit_stats_and_metrics-plus-8-more
+        name: rabbit-ct-rabbit_fifo_v0-logs
+        path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_v0 [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_v0-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_v0-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_v0 [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_v0-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_v0-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_msg_record:
+    name: rabbit-ct-rabbit_msg_record
     needs:
     - prepare
     - rabbit-checks
@@ -1467,57 +4229,754 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-unit_stats_and_metrics
+    - name: RUN ct-rabbit_msg_record
       run: |
-        mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
+        mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_stats_and_metrics \
+          --env CT_SUITE=rabbit_msg_record \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_stats_and_metrics-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-rabbit_msg_record-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_stats_and_metrics-logs
-        path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_tracking
+        name: rabbit-ct-rabbit_msg_record-logs
+        path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_msg_record [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
+        mkdir ct-rabbit_msg_record-logs-v3.7.28 && chmod 777 ct-rabbit_msg_record-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_tracking \
+          --env CT_SUITE=rabbit_msg_record \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_msg_record-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.7.28
+        path: ct-rabbit_msg_record-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_msg_record [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_msg_record-logs-v3.8.9 && chmod 777 ct-rabbit_msg_record-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_msg_record \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_msg_record-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.8.9
+        path: ct-rabbit_msg_record-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_stream_queue:
+    name: rabbit-ct-rabbit_stream_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_stream_queue
+      run: |
+        mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_stream_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_tracking-logs
-        path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-priority_queue_recovery
+        name: rabbit-ct-rabbit_stream_queue-logs
+        path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_stream_queue [mixed v3.7.28]
       run: |
-        mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
+        mkdir ct-rabbit_stream_queue-logs-v3.7.28 && chmod 777 ct-rabbit_stream_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=priority_queue_recovery \
+          --env CT_SUITE=rabbit_stream_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-priority_queue_recovery-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.7.28
+        path: ct-rabbit_stream_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_stream_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_stream_queue-logs-v3.8.9 && chmod 777 ct-rabbit_stream_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_stream_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.8.9
+        path: ct-rabbit_stream_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmq_queues_cli_integration:
+    name: rabbit-ct-rabbitmq_queues_cli_integration
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmq_queues_cli_integration
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-priority_queue_recovery-logs
-        path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs
+        path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs-v3.7.28 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.7.28
+        path: ct-rabbitmq_queues_cli_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs-v3.8.9 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.8.9
+        path: ct-rabbitmq_queues_cli_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmqctl_integration:
+    name: rabbit-ct-rabbitmqctl_integration
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmqctl_integration
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs
+        path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_integration [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_integration-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.7.28
+        path: ct-rabbitmqctl_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_integration [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_integration-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.8.9
+        path: ct-rabbitmqctl_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmqctl_shutdown:
+    name: rabbit-ct-rabbitmqctl_shutdown
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmqctl_shutdown
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs
+        path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_shutdown [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.7.28
+        path: ct-rabbitmqctl_shutdown-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_shutdown [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.8.9
+        path: ct-rabbitmqctl_shutdown-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-signal_handling:
+    name: rabbit-ct-signal_handling
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-signal_handling
+      run: |
+        mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-signal_handling-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs
+        path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-signal_handling [mixed v3.7.28]
+      run: |
+        mkdir ct-signal_handling-logs-v3.7.28 && chmod 777 ct-signal_handling-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-signal_handling-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs-mixed-v3.7.28
+        path: ct-signal_handling-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-signal_handling [mixed v3.8.9]
+      run: |
+        mkdir ct-signal_handling-logs-v3.8.9 && chmod 777 ct-signal_handling-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-signal_handling-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs-mixed-v3.8.9
+        path: ct-signal_handling-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-simple_ha:
+    name: rabbit-ct-simple_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-simple_ha
+      run: |
+        mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-simple_ha-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs
+        path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-simple_ha [mixed v3.7.28]
+      run: |
+        mkdir ct-simple_ha-logs-v3.7.28 && chmod 777 ct-simple_ha-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-simple_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs-mixed-v3.7.28
+        path: ct-simple_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-simple_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-simple_ha-logs-v3.8.9 && chmod 777 ct-simple_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-simple_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs-mixed-v3.8.9
+        path: ct-simple_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-single_active_consumer:
+    name: rabbit-ct-single_active_consumer
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-single_active_consumer
+      run: |
+        mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-single_active_consumer-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs
+        path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-single_active_consumer [mixed v3.7.28]
+      run: |
+        mkdir ct-single_active_consumer-logs-v3.7.28 && chmod 777 ct-single_active_consumer-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-single_active_consumer-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs-mixed-v3.7.28
+        path: ct-single_active_consumer-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-single_active_consumer [mixed v3.8.9]
+      run: |
+        mkdir ct-single_active_consumer-logs-v3.8.9 && chmod 777 ct-single_active_consumer-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-single_active_consumer-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs-mixed-v3.8.9
+        path: ct-single_active_consumer-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-sync_detection:
+    name: rabbit-ct-sync_detection
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-sync_detection
+      run: |
+        mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-sync_detection-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs
+        path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-sync_detection [mixed v3.7.28]
+      run: |
+        mkdir ct-sync_detection-logs-v3.7.28 && chmod 777 ct-sync_detection-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-sync_detection-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs-mixed-v3.7.28
+        path: ct-sync_detection-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-sync_detection [mixed v3.8.9]
+      run: |
+        mkdir ct-sync_detection-logs-v3.8.9 && chmod 777 ct-sync_detection-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-sync_detection-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs-mixed-v3.8.9
+        path: ct-sync_detection-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-term_to_binary_compat_prop:
+    name: rabbit-ct-term_to_binary_compat_prop
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-term_to_binary_compat_prop
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs
+        path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-term_to_binary_compat_prop [mixed v3.7.28]
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs-v3.7.28 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.7.28
+        path: ct-term_to_binary_compat_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-term_to_binary_compat_prop [mixed v3.8.9]
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs-v3.8.9 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.8.9
+        path: ct-term_to_binary_compat_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-topic_permission:
+    name: rabbit-ct-topic_permission
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-topic_permission
+      run: |
+        mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-topic_permission-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs
+        path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-topic_permission [mixed v3.7.28]
+      run: |
+        mkdir ct-topic_permission-logs-v3.7.28 && chmod 777 ct-topic_permission-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-topic_permission-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs-mixed-v3.7.28
+        path: ct-topic_permission-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-topic_permission [mixed v3.8.9]
+      run: |
+        mkdir ct-topic_permission-logs-v3.8.9 && chmod 777 ct-topic_permission-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-topic_permission-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs-mixed-v3.8.9
+        path: ct-topic_permission-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control:
+    name: rabbit-ct-unit_access_control
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control
       run: |
         mkdir ct-unit_access_control-logs && chmod 777 ct-unit_access_control-logs
@@ -1535,40 +4994,261 @@ jobs:
       with:
         name: rabbit-ct-unit_access_control-logs
         path: ct-unit_access_control-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-product_info
+    - name: RUN ct-unit_access_control [mixed v3.7.28]
       run: |
-        mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
+        mkdir ct-unit_access_control-logs-v3.7.28 && chmod 777 ct-unit_access_control-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=product_info \
+          --env CT_SUITE=unit_access_control \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-product_info-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control-logs-mixed-v3.7.28
+        path: ct-unit_access_control-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control-logs-v3.8.9 && chmod 777 ct-unit_access_control-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control-logs-mixed-v3.8.9
+        path: ct-unit_access_control-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control_authn_authz_context_propagation:
+    name: rabbit-ct-unit_access_control_authn_authz_context_propagation
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation
+      run: |
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-product_info-logs
-        path: ct-product_info-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_file_handle_cache
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
+        path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.7.28]
       run: |
-        mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_file_handle_cache \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_file_handle_cache-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.7.28
+        path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.8.9
+        path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control_credential_validation:
+    name: rabbit-ct-unit_access_control_credential_validation
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_access_control_credential_validation
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_file_handle_cache-logs
-        path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-unit_access_control_credential_validation-logs
+        path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_credential_validation [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs-v3.7.28 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.7.28
+        path: ct-unit_access_control_credential_validation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_credential_validation [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs-v3.8.9 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.8.9
+        path: ct-unit_access_control_credential_validation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_amqp091_content_framing:
+    name: rabbit-ct-unit_amqp091_content_framing
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_amqp091_content_framing
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs
+        path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_content_framing [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs-v3.7.28 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.7.28
+        path: ct-unit_amqp091_content_framing-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_content_framing [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs-v3.8.9 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.8.9
+        path: ct-unit_amqp091_content_framing-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_amqp091_server_properties:
+    name: rabbit-ct-unit_amqp091_server_properties
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_server_properties
       run: |
         mkdir ct-unit_amqp091_server_properties-logs && chmod 777 ct-unit_amqp091_server_properties-logs
@@ -1586,6 +5266,261 @@ jobs:
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs
         path: ct-unit_amqp091_server_properties-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_server_properties [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_amqp091_server_properties-logs-v3.7.28 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_server_properties \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_amqp091_server_properties-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.7.28
+        path: ct-unit_amqp091_server_properties-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_server_properties [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_amqp091_server_properties-logs-v3.8.9 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_server_properties \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_amqp091_server_properties-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.8.9
+        path: ct-unit_amqp091_server_properties-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_app_management:
+    name: rabbit-ct-unit_app_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_app_management
+      run: |
+        mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_app_management-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs
+        path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_app_management [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_app_management-logs-v3.7.28 && chmod 777 ct-unit_app_management-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_app_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs-mixed-v3.7.28
+        path: ct-unit_app_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_app_management [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_app_management-logs-v3.8.9 && chmod 777 ct-unit_app_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_app_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs-mixed-v3.8.9
+        path: ct-unit_app_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_cluster_formation_locking_mocks:
+    name: rabbit-ct-unit_cluster_formation_locking_mocks
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_cluster_formation_locking_mocks
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
+        path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.7.28 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.7.28
+        path: ct-unit_cluster_formation_locking_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.8.9 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.8.9
+        path: ct-unit_cluster_formation_locking_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_collections:
+    name: rabbit-ct-unit_collections
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_collections
+      run: |
+        mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_collections-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs
+        path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_collections [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_collections-logs-v3.7.28 && chmod 777 ct-unit_collections-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_collections-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs-mixed-v3.7.28
+        path: ct-unit_collections-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_collections [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_collections-logs-v3.8.9 && chmod 777 ct-unit_collections-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_collections-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs-mixed-v3.8.9
+        path: ct-unit_collections-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_config_value_encryption:
+    name: rabbit-ct-unit_config_value_encryption
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_config_value_encryption
       run: |
         mkdir ct-unit_config_value_encryption-logs && chmod 777 ct-unit_config_value_encryption-logs
@@ -1603,25 +5538,44 @@ jobs:
       with:
         name: rabbit-ct-unit_config_value_encryption-logs
         path: ct-unit_config_value_encryption-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmqctl_integration
+    - name: RUN ct-unit_config_value_encryption [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
+        mkdir ct-unit_config_value_encryption-logs-v3.7.28 && chmod 777 ct-unit_config_value_encryption-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmqctl_integration \
+          --env CT_SUITE=unit_config_value_encryption \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmqctl_integration-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_config_value_encryption-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmqctl_integration-logs
-        path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-feature_flags-plus-7-more:
-    name: rabbit-ct-feature_flags-plus-7-more
+        name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.7.28
+        path: ct-unit_config_value_encryption-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_config_value_encryption [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_config_value_encryption-logs-v3.8.9 && chmod 777 ct-unit_config_value_encryption-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_config_value_encryption \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_config_value_encryption-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.8.9
+        path: ct-unit_config_value_encryption-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_connection_tracking:
+    name: rabbit-ct-unit_connection_tracking
     needs:
     - prepare
     - rabbit-checks
@@ -1635,144 +5589,197 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-feature_flags
+    - name: RUN ct-unit_connection_tracking
       run: |
-        mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
+        mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=feature_flags \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-feature_flags-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_connection_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-feature_flags-logs
-        path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-channel_interceptor
+        name: rabbit-ct-unit_connection_tracking-logs
+        path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_connection_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
+        mkdir ct-unit_connection_tracking-logs-v3.7.28 && chmod 777 ct-unit_connection_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=channel_interceptor \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-channel_interceptor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_connection_tracking-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-channel_interceptor-logs
-        path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-channel_operation_timeout
+        name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.7.28
+        path: ct-unit_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_connection_tracking [mixed v3.8.9]
       run: |
-        mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
+        mkdir ct-unit_connection_tracking-logs-v3.8.9 && chmod 777 ct-unit_connection_tracking-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=channel_operation_timeout \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-channel_operation_timeout-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_connection_tracking-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-channel_operation_timeout-logs
-        path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_log_management
+        name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.8.9
+        path: ct-unit_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_credit_flow:
+    name: rabbit-ct-unit_credit_flow
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_credit_flow
+      run: |
+        mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_log_management \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_log_management-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_credit_flow-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_log_management-logs
-        path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-many_node_ha
+        name: rabbit-ct-unit_credit_flow-logs
+        path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_credit_flow [mixed v3.7.28]
       run: |
-        mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
+        mkdir ct-unit_credit_flow-logs-v3.7.28 && chmod 777 ct-unit_credit_flow-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=many_node_ha \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-many_node_ha-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_credit_flow-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-many_node_ha-logs
-        path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-upgrade_preparation
+        name: rabbit-ct-unit_credit_flow-logs-mixed-v3.7.28
+        path: ct-unit_credit_flow-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_credit_flow [mixed v3.8.9]
       run: |
-        mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
+        mkdir ct-unit_credit_flow-logs-v3.8.9 && chmod 777 ct-unit_credit_flow-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=upgrade_preparation \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-upgrade_preparation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_credit_flow-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-upgrade_preparation-logs
-        path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-consumer_timeout
+        name: rabbit-ct-unit_credit_flow-logs-mixed-v3.8.9
+        path: ct-unit_credit_flow-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_disk_monitor:
+    name: rabbit-ct-unit_disk_monitor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_disk_monitor
+      run: |
+        mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=consumer_timeout \
+          --env CT_SUITE=unit_disk_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-consumer_timeout-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_disk_monitor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-consumer_timeout-logs
-        path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_connection_limit_partitions
+        name: rabbit-ct-unit_disk_monitor-logs
+        path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor [mixed v3.7.28]
       run: |
-        mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
+        mkdir ct-unit_disk_monitor-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env CT_SUITE=unit_disk_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_disk_monitor-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_connection_limit_partitions-logs
-        path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-crashing_queues-plus-5-more:
-    name: rabbit-ct-crashing_queues-plus-5-more
+        name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.7.28
+        path: ct-unit_disk_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_disk_monitor-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_disk_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_disk_monitor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.8.9
+        path: ct-unit_disk_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_disk_monitor_mocks:
+    name: rabbit-ct-unit_disk_monitor_mocks
     needs:
     - prepare
     - rabbit-checks
@@ -1786,110 +5793,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-crashing_queues
+    - name: RUN ct-unit_disk_monitor_mocks
       run: |
-        mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
+        mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=crashing_queues \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-crashing_queues-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-crashing_queues-logs
-        path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-lazy_queue
+        name: rabbit-ct-unit_disk_monitor_mocks-logs
+        path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor_mocks [mixed v3.7.28]
       run: |
-        mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
+        mkdir ct-unit_disk_monitor_mocks-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=lazy_queue \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-lazy_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-lazy_queue-logs
-        path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-sync_detection
+        name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.7.28
+        path: ct-unit_disk_monitor_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor_mocks [mixed v3.8.9]
       run: |
-        mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
+        mkdir ct-unit_disk_monitor_mocks-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=sync_detection \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-sync_detection-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-sync_detection-logs
-        path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-publisher_confirms_parallel
+        name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.8.9
+        path: ct-unit_disk_monitor_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_file_handle_cache:
+    name: rabbit-ct-unit_file_handle_cache
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_file_handle_cache
+      run: |
+        mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=publisher_confirms_parallel \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-publisher_confirms_parallel-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-publisher_confirms_parallel-logs
-        path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_tracking
+        name: rabbit-ct-unit_file_handle_cache-logs
+        path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_file_handle_cache [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
+        mkdir ct-unit_file_handle_cache-logs-v3.7.28 && chmod 777 ct-unit_file_handle_cache-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_tracking \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_tracking-logs
-        path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-peer_discovery_classic_config
+        name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.7.28
+        path: ct-unit_file_handle_cache-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_file_handle_cache [mixed v3.8.9]
       run: |
-        mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
+        mkdir ct-unit_file_handle_cache-logs-v3.8.9 && chmod 777 ct-unit_file_handle_cache-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=peer_discovery_classic_config \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-peer_discovery_classic_config-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-peer_discovery_classic_config-logs
-        path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-per_vhost_queue_limit-plus-4-more:
-    name: rabbit-ct-per_vhost_queue_limit-plus-4-more
+        name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.8.9
+        path: ct-unit_file_handle_cache-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_gen_server2:
+    name: rabbit-ct-unit_gen_server2
     needs:
     - prepare
     - rabbit-checks
@@ -1903,93 +5929,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-per_vhost_queue_limit
+    - name: RUN ct-unit_gen_server2
       run: |
-        mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
+        mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_queue_limit \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_queue_limit-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_gen_server2-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_queue_limit-logs
-        path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-confirms_rejects
+        name: rabbit-ct-unit_gen_server2-logs
+        path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gen_server2 [mixed v3.7.28]
       run: |
-        mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
+        mkdir ct-unit_gen_server2-logs-v3.7.28 && chmod 777 ct-unit_gen_server2-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=confirms_rejects \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-confirms_rejects-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_gen_server2-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-confirms_rejects-logs
-        path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-metrics
+        name: rabbit-ct-unit_gen_server2-logs-mixed-v3.7.28
+        path: ct-unit_gen_server2-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gen_server2 [mixed v3.8.9]
       run: |
-        mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
+        mkdir ct-unit_gen_server2-logs-v3.8.9 && chmod 777 ct-unit_gen_server2-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=metrics \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-metrics-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_gen_server2-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-metrics-logs
-        path: ct-metrics-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-signal_handling
+        name: rabbit-ct-unit_gen_server2-logs-mixed-v3.8.9
+        path: ct-unit_gen_server2-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_gm:
+    name: rabbit-ct-unit_gm
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_gm
+      run: |
+        mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=signal_handling \
+          --env CT_SUITE=unit_gm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-signal_handling-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_gm-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-signal_handling-logs
-        path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo_prop
+        name: rabbit-ct-unit_gm-logs
+        path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gm [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
+        mkdir ct-unit_gm-logs-v3.7.28 && chmod 777 ct-unit_gm-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo_prop \
+          --env CT_SUITE=unit_gm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo_prop-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_gm-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo_prop-logs
-        path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dead_lettering-plus-3-more:
-    name: rabbit-ct-dead_lettering-plus-3-more
+        name: rabbit-ct-unit_gm-logs-mixed-v3.7.28
+        path: ct-unit_gm-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gm [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_gm-logs-v3.8.9 && chmod 777 ct-unit_gm-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_gm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_gm-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_gm-logs-mixed-v3.8.9
+        path: ct-unit_gm-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_log_config:
+    name: rabbit-ct-unit_log_config
     needs:
     - prepare
     - rabbit-checks
@@ -2003,76 +6065,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dead_lettering
+    - name: RUN ct-unit_log_config
       run: |
-        mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
+        mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dead_lettering \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dead_lettering-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_log_config-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dead_lettering-logs
-        path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-maintenance_mode
+        name: rabbit-ct-unit_log_config-logs
+        path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_config [mixed v3.7.28]
       run: |
-        mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
+        mkdir ct-unit_log_config-logs-v3.7.28 && chmod 777 ct-unit_log_config-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=maintenance_mode \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-maintenance_mode-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_log_config-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-maintenance_mode-logs
-        path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-vhost
+        name: rabbit-ct-unit_log_config-logs-mixed-v3.7.28
+        path: ct-unit_log_config-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_config [mixed v3.8.9]
       run: |
-        mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
+        mkdir ct-unit_log_config-logs-v3.8.9 && chmod 777 ct-unit_log_config-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=vhost \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-vhost-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_log_config-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-vhost-logs
-        path: ct-vhost-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_core_metrics_gc
+        name: rabbit-ct-unit_log_config-logs-mixed-v3.8.9
+        path: ct-unit_log_config-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_log_management:
+    name: rabbit-ct-unit_log_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_log_management
+      run: |
+        mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env CT_SUITE=unit_log_management \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_log_management-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_core_metrics_gc-logs
-        path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dynamic_qq-plus-2-more:
-    name: rabbit-ct-dynamic_qq-plus-2-more
+        name: rabbit-ct-unit_log_management-logs
+        path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_management [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_log_management-logs-v3.7.28 && chmod 777 ct-unit_log_management-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_log_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_log_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_log_management-logs-mixed-v3.7.28
+        path: ct-unit_log_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_management [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_log_management-logs-v3.8.9 && chmod 777 ct-unit_log_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_log_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_log_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_log_management-logs-mixed-v3.8.9
+        path: ct-unit_log_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_operator_policy:
+    name: rabbit-ct-unit_operator_policy
     needs:
     - prepare
     - rabbit-checks
@@ -2086,59 +6201,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dynamic_qq
+    - name: RUN ct-unit_operator_policy
       run: |
-        mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
+        mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dynamic_qq \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dynamic_qq-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_operator_policy-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dynamic_qq-logs
-        path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-priority_queue
+        name: rabbit-ct-unit_operator_policy-logs
+        path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_operator_policy [mixed v3.7.28]
       run: |
-        mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
+        mkdir ct-unit_operator_policy-logs-v3.7.28 && chmod 777 ct-unit_operator_policy-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=priority_queue \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-priority_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_operator_policy-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-priority_queue-logs
-        path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_connection_limit
+        name: rabbit-ct-unit_operator_policy-logs-mixed-v3.7.28
+        path: ct-unit_operator_policy-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_operator_policy [mixed v3.8.9]
       run: |
-        mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
+        mkdir ct-unit_operator_policy-logs-v3.8.9 && chmod 777 ct-unit_operator_policy-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_connection_limit \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_connection_limit-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_operator_policy-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_operator_policy-logs-mixed-v3.8.9
+        path: ct-unit_operator_policy-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_pg_local:
+    name: rabbit-ct-unit_pg_local
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_pg_local
+      run: |
+        mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_pg_local-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_connection_limit-logs
-        path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-queue_parallel-plus-2-more:
-    name: rabbit-ct-queue_parallel-plus-2-more
+        name: rabbit-ct-unit_pg_local-logs
+        path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_pg_local [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_pg_local-logs-v3.7.28 && chmod 777 ct-unit_pg_local-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_pg_local-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_pg_local-logs-mixed-v3.7.28
+        path: ct-unit_pg_local-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_pg_local [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_pg_local-logs-v3.8.9 && chmod 777 ct-unit_pg_local-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_pg_local-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_pg_local-logs-mixed-v3.8.9
+        path: ct-unit_pg_local-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_plugin_directories:
+    name: rabbit-ct-unit_plugin_directories
     needs:
     - prepare
     - rabbit-checks
@@ -2152,59 +6337,197 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-queue_parallel
+    - name: RUN ct-unit_plugin_directories
       run: |
-        mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
+        mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_parallel \
+          --env CT_SUITE=unit_plugin_directories \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_parallel-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_plugin_directories-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_parallel-logs
-        path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-cluster_rename
+        name: rabbit-ct-unit_plugin_directories-logs
+        path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_directories [mixed v3.7.28]
       run: |
-        mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
+        mkdir ct-unit_plugin_directories-logs-v3.7.28 && chmod 777 ct-unit_plugin_directories-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=cluster_rename \
+          --env CT_SUITE=unit_plugin_directories \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-cluster_rename-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_plugin_directories-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.7.28
+        path: ct-unit_plugin_directories-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_directories [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_plugin_directories-logs-v3.8.9 && chmod 777 ct-unit_plugin_directories-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_directories \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_plugin_directories-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.8.9
+        path: ct-unit_plugin_directories-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_plugin_versioning:
+    name: rabbit-ct-unit_plugin_versioning
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_plugin_versioning
+      run: |
+        mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_versioning \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-cluster_rename-logs
-        path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-backing_queue
+        name: rabbit-ct-unit_plugin_versioning-logs
+        path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_versioning [mixed v3.7.28]
       run: |
-        mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
+        mkdir ct-unit_plugin_versioning-logs-v3.7.28 && chmod 777 ct-unit_plugin_versioning-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=backing_queue \
+          --env CT_SUITE=unit_plugin_versioning \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-backing_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.7.28
+        path: ct-unit_plugin_versioning-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_versioning [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_plugin_versioning-logs-v3.8.9 && chmod 777 ct-unit_plugin_versioning-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_versioning \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.8.9
+        path: ct-unit_plugin_versioning-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_policy_validators:
+    name: rabbit-ct-unit_policy_validators
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_policy_validators
+      run: |
+        mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_policy_validators-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-backing_queue-logs
-        path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-queue_master_location-plus-1-more:
-    name: rabbit-ct-queue_master_location-plus-1-more
+        name: rabbit-ct-unit_policy_validators-logs
+        path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_policy_validators [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_policy_validators-logs-v3.7.28 && chmod 777 ct-unit_policy_validators-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_policy_validators-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_policy_validators-logs-mixed-v3.7.28
+        path: ct-unit_policy_validators-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_policy_validators [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_policy_validators-logs-v3.8.9 && chmod 777 ct-unit_policy_validators-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_policy_validators-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_policy_validators-logs-mixed-v3.8.9
+        path: ct-unit_policy_validators-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_priority_queue:
+    name: rabbit-ct-unit_priority_queue
     needs:
     - prepare
     - rabbit-checks
@@ -2218,42 +6541,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-queue_master_location
+    - name: RUN ct-unit_priority_queue
       run: |
-        mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
+        mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_master_location \
+          --env CT_SUITE=unit_priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_master_location-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_priority_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_master_location-logs
-        path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-simple_ha
+        name: rabbit-ct-unit_priority_queue-logs
+        path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_priority_queue [mixed v3.7.28]
       run: |
-        mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
+        mkdir ct-unit_priority_queue-logs-v3.7.28 && chmod 777 ct-unit_priority_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=simple_ha \
+          --env CT_SUITE=unit_priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-simple_ha-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_priority_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_priority_queue-logs-mixed-v3.7.28
+        path: ct-unit_priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_priority_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_priority_queue-logs-v3.8.9 && chmod 777 ct-unit_priority_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_priority_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_priority_queue-logs-mixed-v3.8.9
+        path: ct-unit_priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_queue_consumers:
+    name: rabbit-ct-unit_queue_consumers
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_queue_consumers
+      run: |
+        mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_queue_consumers-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-simple_ha-logs
-        path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-eager_sync:
-    name: rabbit-ct-eager_sync
+        name: rabbit-ct-unit_queue_consumers-logs
+        path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_queue_consumers [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_queue_consumers-logs-v3.7.28 && chmod 777 ct-unit_queue_consumers-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_queue_consumers-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.7.28
+        path: ct-unit_queue_consumers-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_queue_consumers [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_queue_consumers-logs-v3.8.9 && chmod 777 ct-unit_queue_consumers-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_queue_consumers-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.8.9
+        path: ct-unit_queue_consumers-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_stats_and_metrics:
+    name: rabbit-ct-unit_stats_and_metrics
     needs:
     - prepare
     - rabbit-checks
@@ -2267,25 +6677,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-eager_sync
+    - name: RUN ct-unit_stats_and_metrics
       run: |
-        mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
+        mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=eager_sync \
+          --env CT_SUITE=unit_stats_and_metrics \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-eager_sync-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-eager_sync-logs
-        path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-rabbit_stream_queue:
-    name: rabbit-ct-rabbit_stream_queue
+        name: rabbit-ct-unit_stats_and_metrics-logs
+        path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_stats_and_metrics [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_stats_and_metrics-logs-v3.7.28 && chmod 777 ct-unit_stats_and_metrics-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_stats_and_metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.7.28
+        path: ct-unit_stats_and_metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_stats_and_metrics [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_stats_and_metrics-logs-v3.8.9 && chmod 777 ct-unit_stats_and_metrics-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_stats_and_metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.8.9
+        path: ct-unit_stats_and_metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_supervisor2:
+    name: rabbit-ct-unit_supervisor2
     needs:
     - prepare
     - rabbit-checks
@@ -2299,25 +6745,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-rabbit_stream_queue
+    - name: RUN ct-unit_supervisor2
       run: |
-        mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
+        mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_stream_queue \
+          --env CT_SUITE=unit_supervisor2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_stream_queue-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_supervisor2-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_stream_queue-logs
-        path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-quorum_queue:
-    name: rabbit-ct-quorum_queue
+        name: rabbit-ct-unit_supervisor2-logs
+        path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_supervisor2 [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_supervisor2-logs-v3.7.28 && chmod 777 ct-unit_supervisor2-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_supervisor2 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_supervisor2-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_supervisor2-logs-mixed-v3.7.28
+        path: ct-unit_supervisor2-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_supervisor2 [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_supervisor2-logs-v3.8.9 && chmod 777 ct-unit_supervisor2-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_supervisor2 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_supervisor2-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_supervisor2-logs-mixed-v3.8.9
+        path: ct-unit_supervisor2-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_vm_memory_monitor:
+    name: rabbit-ct-unit_vm_memory_monitor
     needs:
     - prepare
     - rabbit-checks
@@ -2331,25 +6813,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-quorum_queue
+    - name: RUN ct-unit_vm_memory_monitor
       run: |
-        mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
+        mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=quorum_queue \
+          --env CT_SUITE=unit_vm_memory_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-quorum_queue-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-quorum_queue-logs
-        path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-clustering_management:
-    name: rabbit-ct-clustering_management
+        name: rabbit-ct-unit_vm_memory_monitor-logs
+        path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_vm_memory_monitor [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_vm_memory_monitor-logs-v3.7.28 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_vm_memory_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.7.28
+        path: ct-unit_vm_memory_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_vm_memory_monitor [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_vm_memory_monitor-logs-v3.8.9 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_vm_memory_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.8.9
+        path: ct-unit_vm_memory_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-upgrade_preparation:
+    name: rabbit-ct-upgrade_preparation
     needs:
     - prepare
     - rabbit-checks
@@ -2363,25 +6881,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-clustering_management
+    - name: RUN ct-upgrade_preparation
       run: |
-        mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
+        mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=clustering_management \
+          --env CT_SUITE=upgrade_preparation \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-clustering_management-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-upgrade_preparation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-clustering_management-logs
-        path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dynamic_ha:
-    name: rabbit-ct-dynamic_ha
+        name: rabbit-ct-upgrade_preparation-logs
+        path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-upgrade_preparation [mixed v3.7.28]
+      run: |
+        mkdir ct-upgrade_preparation-logs-v3.7.28 && chmod 777 ct-upgrade_preparation-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=upgrade_preparation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-upgrade_preparation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-upgrade_preparation-logs-mixed-v3.7.28
+        path: ct-upgrade_preparation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-upgrade_preparation [mixed v3.8.9]
+      run: |
+        mkdir ct-upgrade_preparation-logs-v3.8.9 && chmod 777 ct-upgrade_preparation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=upgrade_preparation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-upgrade_preparation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-upgrade_preparation-logs-mixed-v3.8.9
+        path: ct-upgrade_preparation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-vhost:
+    name: rabbit-ct-vhost
     needs:
     - prepare
     - rabbit-checks
@@ -2395,44 +6949,158 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dynamic_ha
+    - name: RUN ct-vhost
       run: |
-        mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
+        mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dynamic_ha \
+          --env CT_SUITE=vhost \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dynamic_ha-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-vhost-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dynamic_ha-logs
-        path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-vhost-logs
+        path: ct-vhost-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-vhost [mixed v3.7.28]
+      run: |
+        mkdir ct-vhost-logs-v3.7.28 && chmod 777 ct-vhost-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=vhost \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-vhost-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-vhost-logs-mixed-v3.7.28
+        path: ct-vhost-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-vhost [mixed v3.8.9]
+      run: |
+        mkdir ct-vhost-logs-v3.8.9 && chmod 777 ct-vhost-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=vhost \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-vhost-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-22.3-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-vhost-logs-mixed-v3.8.9
+        path: ct-vhost-logs-v3.8.9/*-ct-logs-*.tar.xz
   rabbit:
     name: rabbit
     needs:
     - rabbit-checks
-    - rabbit-ct-rabbit_confirms-plus-16-more
-    - rabbit-ct-unit_pg_local-plus-11-more
-    - rabbit-ct-message_size_limit-plus-10-more
-    - rabbit-ct-definition_import-plus-9-more
-    - rabbit-ct-unit_stats_and_metrics-plus-8-more
-    - rabbit-ct-feature_flags-plus-7-more
-    - rabbit-ct-crashing_queues-plus-5-more
-    - rabbit-ct-per_vhost_queue_limit-plus-4-more
-    - rabbit-ct-dead_lettering-plus-3-more
-    - rabbit-ct-dynamic_qq-plus-2-more
-    - rabbit-ct-queue_parallel-plus-2-more
-    - rabbit-ct-queue_master_location-plus-1-more
-    - rabbit-ct-eager_sync
-    - rabbit-ct-rabbit_stream_queue
-    - rabbit-ct-quorum_queue
+    - rabbit-ct-amqqueue_backward_compatibility
+    - rabbit-ct-backing_queue
+    - rabbit-ct-channel_interceptor
+    - rabbit-ct-channel_operation_timeout
+    - rabbit-ct-cluster
+    - rabbit-ct-cluster_rename
     - rabbit-ct-clustering_management
+    - rabbit-ct-config_schema
+    - rabbit-ct-confirms_rejects
+    - rabbit-ct-consumer_timeout
+    - rabbit-ct-crashing_queues
+    - rabbit-ct-dead_lettering
+    - rabbit-ct-definition_import
+    - rabbit-ct-disconnect_detected_during_alarm
     - rabbit-ct-dynamic_ha
+    - rabbit-ct-dynamic_qq
+    - rabbit-ct-eager_sync
+    - rabbit-ct-feature_flags
+    - rabbit-ct-lazy_queue
+    - rabbit-ct-list_consumers_sanity_check
+    - rabbit-ct-list_queues_online_and_offline
+    - rabbit-ct-maintenance_mode
+    - rabbit-ct-many_node_ha
+    - rabbit-ct-message_size_limit
+    - rabbit-ct-metrics
+    - rabbit-ct-mirrored_supervisor
+    - rabbit-ct-msg_store
+    - rabbit-ct-peer_discovery_classic_config
+    - rabbit-ct-peer_discovery_dns
+    - rabbit-ct-per_user_connection_channel_limit
+    - rabbit-ct-per_user_connection_channel_limit_partitions
+    - rabbit-ct-per_user_connection_channel_tracking
+    - rabbit-ct-per_user_connection_tracking
+    - rabbit-ct-per_vhost_connection_limit
+    - rabbit-ct-per_vhost_connection_limit_partitions
+    - rabbit-ct-per_vhost_msg_store
+    - rabbit-ct-per_vhost_queue_limit
+    - rabbit-ct-policy
+    - rabbit-ct-priority_queue
+    - rabbit-ct-priority_queue_recovery
+    - rabbit-ct-product_info
+    - rabbit-ct-proxy_protocol
+    - rabbit-ct-publisher_confirms_parallel
+    - rabbit-ct-queue_length_limits
+    - rabbit-ct-queue_master_location
+    - rabbit-ct-queue_parallel
+    - rabbit-ct-queue_type
+    - rabbit-ct-quorum_queue
+    - rabbit-ct-rabbit_confirms
+    - rabbit-ct-rabbit_core_metrics_gc
+    - rabbit-ct-rabbit_fifo
+    - rabbit-ct-rabbit_fifo_int
+    - rabbit-ct-rabbit_fifo_prop
+    - rabbit-ct-rabbit_fifo_v0
+    - rabbit-ct-rabbit_msg_record
+    - rabbit-ct-rabbit_stream_queue
+    - rabbit-ct-rabbitmq_queues_cli_integration
+    - rabbit-ct-rabbitmqctl_integration
+    - rabbit-ct-rabbitmqctl_shutdown
+    - rabbit-ct-signal_handling
+    - rabbit-ct-simple_ha
+    - rabbit-ct-single_active_consumer
+    - rabbit-ct-sync_detection
+    - rabbit-ct-term_to_binary_compat_prop
+    - rabbit-ct-topic_permission
+    - rabbit-ct-unit_access_control
+    - rabbit-ct-unit_access_control_authn_authz_context_propagation
+    - rabbit-ct-unit_access_control_credential_validation
+    - rabbit-ct-unit_amqp091_content_framing
+    - rabbit-ct-unit_amqp091_server_properties
+    - rabbit-ct-unit_app_management
+    - rabbit-ct-unit_cluster_formation_locking_mocks
+    - rabbit-ct-unit_collections
+    - rabbit-ct-unit_config_value_encryption
+    - rabbit-ct-unit_connection_tracking
+    - rabbit-ct-unit_credit_flow
+    - rabbit-ct-unit_disk_monitor
+    - rabbit-ct-unit_disk_monitor_mocks
+    - rabbit-ct-unit_file_handle_cache
+    - rabbit-ct-unit_gen_server2
+    - rabbit-ct-unit_gm
+    - rabbit-ct-unit_log_config
+    - rabbit-ct-unit_log_management
+    - rabbit-ct-unit_operator_policy
+    - rabbit-ct-unit_pg_local
+    - rabbit-ct-unit_plugin_directories
+    - rabbit-ct-unit_plugin_versioning
+    - rabbit-ct-unit_policy_validators
+    - rabbit-ct-unit_priority_queue
+    - rabbit-ct-unit_queue_consumers
+    - rabbit-ct-unit_stats_and_metrics
+    - rabbit-ct-unit_supervisor2
+    - rabbit-ct-unit_vm_memory_monitor
+    - rabbit-ct-upgrade_preparation
+    - rabbit-ct-vhost
     runs-on: ubuntu-18.04
     if: always()
     steps:
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml
index 773e926e32..842fc68546 100644
--- a/.github/workflows/test-erlang-otp-23.1.yaml
+++ b/.github/workflows/test-erlang-otp-23.1.yaml
@@ -712,8 +712,8 @@ jobs:
         dockerfile: ci/dockerfiles/ci-dep
         build_args: IMAGE_TAG=erlang-23.1-rabbitmq-${{ github.sha }},BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }},project=rabbit
         tags: erlang-23.1-rabbitmq-${{ github.sha }}
-  rabbit-ct-rabbit_confirms-plus-16-more:
-    name: rabbit-ct-rabbit_confirms-plus-16-more
+  rabbit-ct-amqqueue_backward_compatibility:
+    name: rabbit-ct-amqqueue_backward_compatibility
     needs:
     - prepare
     - rabbit-checks
@@ -727,297 +727,1149 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-rabbit_confirms
+    - name: RUN ct-amqqueue_backward_compatibility
       run: |
-        mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
+        mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_confirms \
+          --env CT_SUITE=amqqueue_backward_compatibility \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_confirms-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_confirms-logs
-        path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_msg_record
+        name: rabbit-ct-amqqueue_backward_compatibility-logs
+        path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-amqqueue_backward_compatibility [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
+        mkdir ct-amqqueue_backward_compatibility-logs-v3.7.28 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_msg_record \
+          --env CT_SUITE=amqqueue_backward_compatibility \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_msg_record-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.7.28
+        path: ct-amqqueue_backward_compatibility-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-amqqueue_backward_compatibility [mixed v3.8.9]
+      run: |
+        mkdir ct-amqqueue_backward_compatibility-logs-v3.8.9 && chmod 777 ct-amqqueue_backward_compatibility-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=amqqueue_backward_compatibility \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-amqqueue_backward_compatibility-logs-mixed-v3.8.9
+        path: ct-amqqueue_backward_compatibility-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-backing_queue:
+    name: rabbit-ct-backing_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-backing_queue
+      run: |
+        mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=backing_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-backing_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_msg_record-logs
-        path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo_v0
+        name: rabbit-ct-backing_queue-logs
+        path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-backing_queue [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
+        mkdir ct-backing_queue-logs-v3.7.28 && chmod 777 ct-backing_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo_v0 \
+          --env CT_SUITE=backing_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo_v0-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-backing_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-backing_queue-logs-mixed-v3.7.28
+        path: ct-backing_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-backing_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-backing_queue-logs-v3.8.9 && chmod 777 ct-backing_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=backing_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-backing_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-backing_queue-logs-mixed-v3.8.9
+        path: ct-backing_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-channel_interceptor:
+    name: rabbit-ct-channel_interceptor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-channel_interceptor
+      run: |
+        mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_interceptor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-channel_interceptor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo_v0-logs
-        path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_connection_tracking
+        name: rabbit-ct-channel_interceptor-logs
+        path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_interceptor [mixed v3.7.28]
       run: |
-        mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
+        mkdir ct-channel_interceptor-logs-v3.7.28 && chmod 777 ct-channel_interceptor-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_connection_tracking \
+          --env CT_SUITE=channel_interceptor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_connection_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-channel_interceptor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_interceptor-logs-mixed-v3.7.28
+        path: ct-channel_interceptor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_interceptor [mixed v3.8.9]
+      run: |
+        mkdir ct-channel_interceptor-logs-v3.8.9 && chmod 777 ct-channel_interceptor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_interceptor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-channel_interceptor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_interceptor-logs-mixed-v3.8.9
+        path: ct-channel_interceptor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-channel_operation_timeout:
+    name: rabbit-ct-channel_operation_timeout
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-channel_operation_timeout
+      run: |
+        mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_operation_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-channel_operation_timeout-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_connection_tracking-logs
-        path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_plugin_directories
+        name: rabbit-ct-channel_operation_timeout-logs
+        path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_operation_timeout [mixed v3.7.28]
       run: |
-        mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
+        mkdir ct-channel_operation_timeout-logs-v3.7.28 && chmod 777 ct-channel_operation_timeout-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_plugin_directories \
+          --env CT_SUITE=channel_operation_timeout \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_plugin_directories-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-channel_operation_timeout-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.7.28
+        path: ct-channel_operation_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-channel_operation_timeout [mixed v3.8.9]
+      run: |
+        mkdir ct-channel_operation_timeout-logs-v3.8.9 && chmod 777 ct-channel_operation_timeout-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=channel_operation_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-channel_operation_timeout-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-channel_operation_timeout-logs-mixed-v3.8.9
+        path: ct-channel_operation_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-cluster:
+    name: rabbit-ct-cluster
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-cluster
+      run: |
+        mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-cluster-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_plugin_directories-logs
-        path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_limit_partitions
+        name: rabbit-ct-cluster-logs
+        path: ct-cluster-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
+        mkdir ct-cluster-logs-v3.7.28 && chmod 777 ct-cluster-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env CT_SUITE=cluster \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-cluster-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster-logs-mixed-v3.7.28
+        path: ct-cluster-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster [mixed v3.8.9]
+      run: |
+        mkdir ct-cluster-logs-v3.8.9 && chmod 777 ct-cluster-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-cluster-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster-logs-mixed-v3.8.9
+        path: ct-cluster-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-cluster_rename:
+    name: rabbit-ct-cluster_rename
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-cluster_rename
+      run: |
+        mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster_rename \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-cluster_rename-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
-        path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-queue_type
+        name: rabbit-ct-cluster_rename-logs
+        path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster_rename [mixed v3.7.28]
       run: |
-        mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
+        mkdir ct-cluster_rename-logs-v3.7.28 && chmod 777 ct-cluster_rename-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_type \
+          --env CT_SUITE=cluster_rename \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_type-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-cluster_rename-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster_rename-logs-mixed-v3.7.28
+        path: ct-cluster_rename-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-cluster_rename [mixed v3.8.9]
+      run: |
+        mkdir ct-cluster_rename-logs-v3.8.9 && chmod 777 ct-cluster_rename-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=cluster_rename \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-cluster_rename-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-cluster_rename-logs-mixed-v3.8.9
+        path: ct-cluster_rename-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-clustering_management:
+    name: rabbit-ct-clustering_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-clustering_management
+      run: |
+        mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=clustering_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-clustering_management-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_type-logs
-        path: ct-queue_type-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_cluster_formation_locking_mocks
+        name: rabbit-ct-clustering_management-logs
+        path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-clustering_management [mixed v3.7.28]
       run: |
-        mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
+        mkdir ct-clustering_management-logs-v3.7.28 && chmod 777 ct-clustering_management-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env CT_SUITE=clustering_management \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-clustering_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-clustering_management-logs-mixed-v3.7.28
+        path: ct-clustering_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-clustering_management [mixed v3.8.9]
+      run: |
+        mkdir ct-clustering_management-logs-v3.8.9 && chmod 777 ct-clustering_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=clustering_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-clustering_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-clustering_management-logs-mixed-v3.8.9
+        path: ct-clustering_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-config_schema:
+    name: rabbit-ct-config_schema
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-config_schema
+      run: |
+        mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=config_schema \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-config_schema-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
-        path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_collections
+        name: rabbit-ct-config_schema-logs
+        path: ct-config_schema-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-config_schema [mixed v3.7.28]
       run: |
-        mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
+        mkdir ct-config_schema-logs-v3.7.28 && chmod 777 ct-config_schema-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_collections \
+          --env CT_SUITE=config_schema \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_collections-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-config_schema-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-config_schema-logs-mixed-v3.7.28
+        path: ct-config_schema-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-config_schema [mixed v3.8.9]
+      run: |
+        mkdir ct-config_schema-logs-v3.8.9 && chmod 777 ct-config_schema-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=config_schema \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-config_schema-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-config_schema-logs-mixed-v3.8.9
+        path: ct-config_schema-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-confirms_rejects:
+    name: rabbit-ct-confirms_rejects
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-confirms_rejects
+      run: |
+        mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=confirms_rejects \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-confirms_rejects-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_collections-logs
-        path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-amqqueue_backward_compatibility
+        name: rabbit-ct-confirms_rejects-logs
+        path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-confirms_rejects [mixed v3.7.28]
       run: |
-        mkdir ct-amqqueue_backward_compatibility-logs && chmod 777 ct-amqqueue_backward_compatibility-logs
+        mkdir ct-confirms_rejects-logs-v3.7.28 && chmod 777 ct-confirms_rejects-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=amqqueue_backward_compatibility \
+          --env CT_SUITE=confirms_rejects \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-amqqueue_backward_compatibility-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-confirms_rejects-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-confirms_rejects-logs-mixed-v3.7.28
+        path: ct-confirms_rejects-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-confirms_rejects [mixed v3.8.9]
+      run: |
+        mkdir ct-confirms_rejects-logs-v3.8.9 && chmod 777 ct-confirms_rejects-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=confirms_rejects \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-confirms_rejects-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-confirms_rejects-logs-mixed-v3.8.9
+        path: ct-confirms_rejects-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-consumer_timeout:
+    name: rabbit-ct-consumer_timeout
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-consumer_timeout
+      run: |
+        mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=consumer_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-consumer_timeout-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-amqqueue_backward_compatibility-logs
-        path: ct-amqqueue_backward_compatibility-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-msg_store
+        name: rabbit-ct-consumer_timeout-logs
+        path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-consumer_timeout [mixed v3.7.28]
       run: |
-        mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
+        mkdir ct-consumer_timeout-logs-v3.7.28 && chmod 777 ct-consumer_timeout-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=msg_store \
+          --env CT_SUITE=consumer_timeout \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-msg_store-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-consumer_timeout-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-consumer_timeout-logs-mixed-v3.7.28
+        path: ct-consumer_timeout-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-consumer_timeout [mixed v3.8.9]
+      run: |
+        mkdir ct-consumer_timeout-logs-v3.8.9 && chmod 777 ct-consumer_timeout-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=consumer_timeout \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-consumer_timeout-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-consumer_timeout-logs-mixed-v3.8.9
+        path: ct-consumer_timeout-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-crashing_queues:
+    name: rabbit-ct-crashing_queues
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-crashing_queues
+      run: |
+        mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=crashing_queues \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-crashing_queues-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-msg_store-logs
-        path: ct-msg_store-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_gm
+        name: rabbit-ct-crashing_queues-logs
+        path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-crashing_queues [mixed v3.7.28]
       run: |
-        mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
+        mkdir ct-crashing_queues-logs-v3.7.28 && chmod 777 ct-crashing_queues-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_gm \
+          --env CT_SUITE=crashing_queues \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_gm-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-crashing_queues-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-crashing_queues-logs-mixed-v3.7.28
+        path: ct-crashing_queues-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-crashing_queues [mixed v3.8.9]
+      run: |
+        mkdir ct-crashing_queues-logs-v3.8.9 && chmod 777 ct-crashing_queues-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=crashing_queues \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-crashing_queues-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-crashing_queues-logs-mixed-v3.8.9
+        path: ct-crashing_queues-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dead_lettering:
+    name: rabbit-ct-dead_lettering
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dead_lettering
+      run: |
+        mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dead_lettering \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dead_lettering-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_gm-logs
-        path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_msg_store
+        name: rabbit-ct-dead_lettering-logs
+        path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dead_lettering [mixed v3.7.28]
       run: |
-        mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
+        mkdir ct-dead_lettering-logs-v3.7.28 && chmod 777 ct-dead_lettering-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_msg_store \
+          --env CT_SUITE=dead_lettering \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_msg_store-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dead_lettering-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dead_lettering-logs-mixed-v3.7.28
+        path: ct-dead_lettering-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dead_lettering [mixed v3.8.9]
+      run: |
+        mkdir ct-dead_lettering-logs-v3.8.9 && chmod 777 ct-dead_lettering-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dead_lettering \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dead_lettering-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dead_lettering-logs-mixed-v3.8.9
+        path: ct-dead_lettering-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-definition_import:
+    name: rabbit-ct-definition_import
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-definition_import
+      run: |
+        mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=definition_import \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-definition_import-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_msg_store-logs
-        path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-term_to_binary_compat_prop
+        name: rabbit-ct-definition_import-logs
+        path: ct-definition_import-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-definition_import [mixed v3.7.28]
       run: |
-        mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
+        mkdir ct-definition_import-logs-v3.7.28 && chmod 777 ct-definition_import-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=term_to_binary_compat_prop \
+          --env CT_SUITE=definition_import \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-term_to_binary_compat_prop-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-definition_import-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-definition_import-logs-mixed-v3.7.28
+        path: ct-definition_import-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-definition_import [mixed v3.8.9]
+      run: |
+        mkdir ct-definition_import-logs-v3.8.9 && chmod 777 ct-definition_import-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=definition_import \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-definition_import-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-definition_import-logs-mixed-v3.8.9
+        path: ct-definition_import-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-disconnect_detected_during_alarm:
+    name: rabbit-ct-disconnect_detected_during_alarm
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-disconnect_detected_during_alarm
+      run: |
+        mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-term_to_binary_compat_prop-logs
-        path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_operator_policy
+        name: rabbit-ct-disconnect_detected_during_alarm-logs
+        path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-disconnect_detected_during_alarm [mixed v3.7.28]
       run: |
-        mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
+        mkdir ct-disconnect_detected_during_alarm-logs-v3.7.28 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_operator_policy \
+          --env CT_SUITE=disconnect_detected_during_alarm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_operator_policy-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.7.28
+        path: ct-disconnect_detected_during_alarm-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-disconnect_detected_during_alarm [mixed v3.8.9]
+      run: |
+        mkdir ct-disconnect_detected_during_alarm-logs-v3.8.9 && chmod 777 ct-disconnect_detected_during_alarm-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-disconnect_detected_during_alarm-logs-mixed-v3.8.9
+        path: ct-disconnect_detected_during_alarm-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dynamic_ha:
+    name: rabbit-ct-dynamic_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dynamic_ha
+      run: |
+        mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dynamic_ha-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_operator_policy-logs
-        path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmqctl_shutdown
+        name: rabbit-ct-dynamic_ha-logs
+        path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_ha [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
+        mkdir ct-dynamic_ha-logs-v3.7.28 && chmod 777 ct-dynamic_ha-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env CT_SUITE=dynamic_ha \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dynamic_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_ha-logs-mixed-v3.7.28
+        path: ct-dynamic_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-dynamic_ha-logs-v3.8.9 && chmod 777 ct-dynamic_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dynamic_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_ha-logs-mixed-v3.8.9
+        path: ct-dynamic_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-dynamic_qq:
+    name: rabbit-ct-dynamic_qq
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-dynamic_qq
+      run: |
+        mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_qq \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-dynamic_qq-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmqctl_shutdown-logs
-        path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_amqp091_content_framing
+        name: rabbit-ct-dynamic_qq-logs
+        path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_qq [mixed v3.7.28]
       run: |
-        mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
+        mkdir ct-dynamic_qq-logs-v3.7.28 && chmod 777 ct-dynamic_qq-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_amqp091_content_framing \
+          --env CT_SUITE=dynamic_qq \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_amqp091_content_framing-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-dynamic_qq-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_qq-logs-mixed-v3.7.28
+        path: ct-dynamic_qq-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-dynamic_qq [mixed v3.8.9]
+      run: |
+        mkdir ct-dynamic_qq-logs-v3.8.9 && chmod 777 ct-dynamic_qq-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=dynamic_qq \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-dynamic_qq-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-dynamic_qq-logs-mixed-v3.8.9
+        path: ct-dynamic_qq-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-eager_sync:
+    name: rabbit-ct-eager_sync
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-eager_sync
+      run: |
+        mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-eager_sync-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_amqp091_content_framing-logs
-        path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-unit_pg_local-plus-11-more:
-    name: rabbit-ct-unit_pg_local-plus-11-more
+        name: rabbit-ct-eager_sync-logs
+        path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-eager_sync [mixed v3.7.28]
+      run: |
+        mkdir ct-eager_sync-logs-v3.7.28 && chmod 777 ct-eager_sync-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-eager_sync-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-eager_sync-logs-mixed-v3.7.28
+        path: ct-eager_sync-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-eager_sync [mixed v3.8.9]
+      run: |
+        mkdir ct-eager_sync-logs-v3.8.9 && chmod 777 ct-eager_sync-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=eager_sync \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-eager_sync-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-eager_sync-logs-mixed-v3.8.9
+        path: ct-eager_sync-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-feature_flags:
+    name: rabbit-ct-feature_flags
     needs:
     - prepare
     - rabbit-checks
@@ -1031,159 +1883,754 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-unit_pg_local
+    - name: RUN ct-feature_flags
       run: |
-        mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
+        mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_pg_local \
+          --env CT_SUITE=feature_flags \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_pg_local-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-feature_flags-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_pg_local-logs
-        path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_policy_validators
+        name: rabbit-ct-feature_flags-logs
+        path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-feature_flags [mixed v3.7.28]
       run: |
-        mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
+        mkdir ct-feature_flags-logs-v3.7.28 && chmod 777 ct-feature_flags-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_policy_validators \
+          --env CT_SUITE=feature_flags \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_policy_validators-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-feature_flags-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-feature_flags-logs-mixed-v3.7.28
+        path: ct-feature_flags-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-feature_flags [mixed v3.8.9]
+      run: |
+        mkdir ct-feature_flags-logs-v3.8.9 && chmod 777 ct-feature_flags-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=feature_flags \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-feature_flags-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-feature_flags-logs-mixed-v3.8.9
+        path: ct-feature_flags-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-lazy_queue:
+    name: rabbit-ct-lazy_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-lazy_queue
+      run: |
+        mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=lazy_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-lazy_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_policy_validators-logs
-        path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_limit
+        name: rabbit-ct-lazy_queue-logs
+        path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-lazy_queue [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
+        mkdir ct-lazy_queue-logs-v3.7.28 && chmod 777 ct-lazy_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_limit \
+          --env CT_SUITE=lazy_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_limit-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-lazy_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-lazy_queue-logs-mixed-v3.7.28
+        path: ct-lazy_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-lazy_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-lazy_queue-logs-v3.8.9 && chmod 777 ct-lazy_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=lazy_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-lazy_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-lazy_queue-logs-mixed-v3.8.9
+        path: ct-lazy_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-list_consumers_sanity_check:
+    name: rabbit-ct-list_consumers_sanity_check
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-list_consumers_sanity_check
+      run: |
+        mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_consumers_sanity_check \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_limit-logs
-        path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_plugin_versioning
+        name: rabbit-ct-list_consumers_sanity_check-logs
+        path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_consumers_sanity_check [mixed v3.7.28]
       run: |
-        mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
+        mkdir ct-list_consumers_sanity_check-logs-v3.7.28 && chmod 777 ct-list_consumers_sanity_check-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_plugin_versioning \
+          --env CT_SUITE=list_consumers_sanity_check \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_plugin_versioning-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.7.28
+        path: ct-list_consumers_sanity_check-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_consumers_sanity_check [mixed v3.8.9]
+      run: |
+        mkdir ct-list_consumers_sanity_check-logs-v3.8.9 && chmod 777 ct-list_consumers_sanity_check-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_consumers_sanity_check \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-list_consumers_sanity_check-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_consumers_sanity_check-logs-mixed-v3.8.9
+        path: ct-list_consumers_sanity_check-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-list_queues_online_and_offline:
+    name: rabbit-ct-list_queues_online_and_offline
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-list_queues_online_and_offline
+      run: |
+        mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_queues_online_and_offline \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_plugin_versioning-logs
-        path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_priority_queue
+        name: rabbit-ct-list_queues_online_and_offline-logs
+        path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_queues_online_and_offline [mixed v3.7.28]
       run: |
-        mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
+        mkdir ct-list_queues_online_and_offline-logs-v3.7.28 && chmod 777 ct-list_queues_online_and_offline-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_priority_queue \
+          --env CT_SUITE=list_queues_online_and_offline \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_priority_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.7.28
+        path: ct-list_queues_online_and_offline-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-list_queues_online_and_offline [mixed v3.8.9]
+      run: |
+        mkdir ct-list_queues_online_and_offline-logs-v3.8.9 && chmod 777 ct-list_queues_online_and_offline-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=list_queues_online_and_offline \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-list_queues_online_and_offline-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-list_queues_online_and_offline-logs-mixed-v3.8.9
+        path: ct-list_queues_online_and_offline-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-maintenance_mode:
+    name: rabbit-ct-maintenance_mode
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-maintenance_mode
+      run: |
+        mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=maintenance_mode \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-maintenance_mode-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_priority_queue-logs
-        path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_supervisor2
+        name: rabbit-ct-maintenance_mode-logs
+        path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-maintenance_mode [mixed v3.7.28]
       run: |
-        mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
+        mkdir ct-maintenance_mode-logs-v3.7.28 && chmod 777 ct-maintenance_mode-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_supervisor2 \
+          --env CT_SUITE=maintenance_mode \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_supervisor2-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-maintenance_mode-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-maintenance_mode-logs-mixed-v3.7.28
+        path: ct-maintenance_mode-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-maintenance_mode [mixed v3.8.9]
+      run: |
+        mkdir ct-maintenance_mode-logs-v3.8.9 && chmod 777 ct-maintenance_mode-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=maintenance_mode \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-maintenance_mode-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-maintenance_mode-logs-mixed-v3.8.9
+        path: ct-maintenance_mode-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-many_node_ha:
+    name: rabbit-ct-many_node_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-many_node_ha
+      run: |
+        mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=many_node_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-many_node_ha-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_supervisor2-logs
-        path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_queue_consumers
+        name: rabbit-ct-many_node_ha-logs
+        path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-many_node_ha [mixed v3.7.28]
       run: |
-        mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
+        mkdir ct-many_node_ha-logs-v3.7.28 && chmod 777 ct-many_node_ha-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_queue_consumers \
+          --env CT_SUITE=many_node_ha \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_queue_consumers-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-many_node_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-many_node_ha-logs-mixed-v3.7.28
+        path: ct-many_node_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-many_node_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-many_node_ha-logs-v3.8.9 && chmod 777 ct-many_node_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=many_node_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-many_node_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-many_node_ha-logs-mixed-v3.8.9
+        path: ct-many_node_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-message_size_limit:
+    name: rabbit-ct-message_size_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-message_size_limit
+      run: |
+        mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=message_size_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-message_size_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_queue_consumers-logs
-        path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_access_control_credential_validation
+        name: rabbit-ct-message_size_limit-logs
+        path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-message_size_limit [mixed v3.7.28]
       run: |
-        mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
+        mkdir ct-message_size_limit-logs-v3.7.28 && chmod 777 ct-message_size_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_access_control_credential_validation \
+          --env CT_SUITE=message_size_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_access_control_credential_validation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-message_size_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-message_size_limit-logs-mixed-v3.7.28
+        path: ct-message_size_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-message_size_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-message_size_limit-logs-v3.8.9 && chmod 777 ct-message_size_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=message_size_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-message_size_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-message_size_limit-logs-mixed-v3.8.9
+        path: ct-message_size_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-metrics:
+    name: rabbit-ct-metrics
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-metrics
+      run: |
+        mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-metrics-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_access_control_credential_validation-logs
-        path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_log_config
+        name: rabbit-ct-metrics-logs
+        path: ct-metrics-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-metrics [mixed v3.7.28]
       run: |
-        mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
+        mkdir ct-metrics-logs-v3.7.28 && chmod 777 ct-metrics-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_log_config \
+          --env CT_SUITE=metrics \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_log_config-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-metrics-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-metrics-logs-mixed-v3.7.28
+        path: ct-metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-metrics [mixed v3.8.9]
+      run: |
+        mkdir ct-metrics-logs-v3.8.9 && chmod 777 ct-metrics-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-metrics-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-metrics-logs-mixed-v3.8.9
+        path: ct-metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-mirrored_supervisor:
+    name: rabbit-ct-mirrored_supervisor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-mirrored_supervisor
+      run: |
+        mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-mirrored_supervisor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_log_config-logs
-        path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-mirrored_supervisor-logs
+        path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-mirrored_supervisor [mixed v3.7.28]
+      run: |
+        mkdir ct-mirrored_supervisor-logs-v3.7.28 && chmod 777 ct-mirrored_supervisor-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-mirrored_supervisor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.7.28
+        path: ct-mirrored_supervisor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-mirrored_supervisor [mixed v3.8.9]
+      run: |
+        mkdir ct-mirrored_supervisor-logs-v3.8.9 && chmod 777 ct-mirrored_supervisor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=mirrored_supervisor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-mirrored_supervisor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-mirrored_supervisor-logs-mixed-v3.8.9
+        path: ct-mirrored_supervisor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-msg_store:
+    name: rabbit-ct-msg_store
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-msg_store
+      run: |
+        mkdir ct-msg_store-logs && chmod 777 ct-msg_store-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-msg_store-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs
+        path: ct-msg_store-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-msg_store [mixed v3.7.28]
+      run: |
+        mkdir ct-msg_store-logs-v3.7.28 && chmod 777 ct-msg_store-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-msg_store-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs-mixed-v3.7.28
+        path: ct-msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-msg_store [mixed v3.8.9]
+      run: |
+        mkdir ct-msg_store-logs-v3.8.9 && chmod 777 ct-msg_store-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-msg_store-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-msg_store-logs-mixed-v3.8.9
+        path: ct-msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-peer_discovery_classic_config:
+    name: rabbit-ct-peer_discovery_classic_config
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-peer_discovery_classic_config
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs
+        path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_classic_config [mixed v3.7.28]
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs-v3.7.28 && chmod 777 ct-peer_discovery_classic_config-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.7.28
+        path: ct-peer_discovery_classic_config-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_classic_config [mixed v3.8.9]
+      run: |
+        mkdir ct-peer_discovery_classic_config-logs-v3.8.9 && chmod 777 ct-peer_discovery_classic_config-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_classic_config \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-peer_discovery_classic_config-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_classic_config-logs-mixed-v3.8.9
+        path: ct-peer_discovery_classic_config-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-peer_discovery_dns:
+    name: rabbit-ct-peer_discovery_dns
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-peer_discovery_dns
       run: |
         mkdir ct-peer_discovery_dns-logs && chmod 777 ct-peer_discovery_dns-logs
@@ -1201,42 +2648,180 @@ jobs:
       with:
         name: rabbit-ct-peer_discovery_dns-logs
         path: ct-peer_discovery_dns-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_disk_monitor_mocks
+    - name: RUN ct-peer_discovery_dns [mixed v3.7.28]
       run: |
-        mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
+        mkdir ct-peer_discovery_dns-logs-v3.7.28 && chmod 777 ct-peer_discovery_dns-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_disk_monitor_mocks \
+          --env CT_SUITE=peer_discovery_dns \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-peer_discovery_dns-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.7.28
+        path: ct-peer_discovery_dns-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-peer_discovery_dns [mixed v3.8.9]
+      run: |
+        mkdir ct-peer_discovery_dns-logs-v3.8.9 && chmod 777 ct-peer_discovery_dns-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=peer_discovery_dns \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-peer_discovery_dns-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-peer_discovery_dns-logs-mixed-v3.8.9
+        path: ct-peer_discovery_dns-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_limit:
+    name: rabbit-ct-per_user_connection_channel_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_channel_limit
+      run: |
+        mkdir ct-per_user_connection_channel_limit-logs && chmod 777 ct-per_user_connection_channel_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_disk_monitor_mocks-logs
-        path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-topic_permission
+        name: rabbit-ct-per_user_connection_channel_limit-logs
+        path: ct-per_user_connection_channel_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit [mixed v3.7.28]
       run: |
-        mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
+        mkdir ct-per_user_connection_channel_limit-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=topic_permission \
+          --env CT_SUITE=per_user_connection_channel_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-topic_permission-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_limit-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_limit_partitions:
+    name: rabbit-ct-per_user_connection_channel_limit_partitions
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_channel_limit_partitions
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs && chmod 777 ct-per_user_connection_channel_limit_partitions-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-topic_permission-logs
-        path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-message_size_limit-plus-10-more:
-    name: rabbit-ct-message_size_limit-plus-10-more
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs
+        path: ct-per_user_connection_channel_limit_partitions-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.7.28]
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_limit_partitions [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_limit_partitions-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_limit_partitions-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_limit_partitions-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_channel_tracking:
+    name: rabbit-ct-per_user_connection_channel_tracking
     needs:
     - prepare
     - rabbit-checks
@@ -1250,195 +2835,741 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-message_size_limit
+    - name: RUN ct-per_user_connection_channel_tracking
       run: |
-        mkdir ct-message_size_limit-logs && chmod 777 ct-message_size_limit-logs
+        mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=message_size_limit \
+          --env CT_SUITE=per_user_connection_channel_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-message_size_limit-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-message_size_limit-logs
-        path: ct-message_size_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-proxy_protocol
+        name: rabbit-ct-per_user_connection_channel_tracking-logs
+        path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
+        mkdir ct-per_user_connection_channel_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=proxy_protocol \
+          --env CT_SUITE=per_user_connection_channel_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-proxy_protocol-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.7.28
+        path: ct-per_user_connection_channel_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_channel_tracking [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_channel_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_channel_tracking-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_channel_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_channel_tracking-logs-mixed-v3.8.9
+        path: ct-per_user_connection_channel_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_user_connection_tracking:
+    name: rabbit-ct-per_user_connection_tracking
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_user_connection_tracking
+      run: |
+        mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-proxy_protocol-logs
-        path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-single_active_consumer
+        name: rabbit-ct-per_user_connection_tracking-logs
+        path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
+        mkdir ct-per_user_connection_tracking-logs-v3.7.28 && chmod 777 ct-per_user_connection_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=single_active_consumer \
+          --env CT_SUITE=per_user_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-single_active_consumer-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.7.28
+        path: ct-per_user_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_user_connection_tracking [mixed v3.8.9]
+      run: |
+        mkdir ct-per_user_connection_tracking-logs-v3.8.9 && chmod 777 ct-per_user_connection_tracking-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_user_connection_tracking \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_user_connection_tracking-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_user_connection_tracking-logs-mixed-v3.8.9
+        path: ct-per_user_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_connection_limit:
+    name: rabbit-ct-per_vhost_connection_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_connection_limit
+      run: |
+        mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-single_active_consumer-logs
-        path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo
+        name: rabbit-ct-per_vhost_connection_limit-logs
+        path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
+        mkdir ct-per_vhost_connection_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo \
+          --env CT_SUITE=per_vhost_connection_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.7.28
+        path: ct-per_vhost_connection_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_connection_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_connection_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit-logs-mixed-v3.8.9
+        path: ct-per_vhost_connection_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_connection_limit_partitions:
+    name: rabbit-ct-per_vhost_connection_limit_partitions
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_connection_limit_partitions
+      run: |
+        mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo-logs
-        path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_app_management
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs
+        path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.7.28]
       run: |
-        mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
+        mkdir ct-per_vhost_connection_limit_partitions-logs-v3.7.28 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_app_management \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_app_management-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.7.28
+        path: ct-per_vhost_connection_limit_partitions-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_connection_limit_partitions [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_connection_limit_partitions-logs-v3.8.9 && chmod 777 ct-per_vhost_connection_limit_partitions-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_connection_limit_partitions-logs-mixed-v3.8.9
+        path: ct-per_vhost_connection_limit_partitions-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_msg_store:
+    name: rabbit-ct-per_vhost_msg_store
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_msg_store
+      run: |
+        mkdir ct-per_vhost_msg_store-logs && chmod 777 ct-per_vhost_msg_store-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_app_management-logs
-        path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_disk_monitor
+        name: rabbit-ct-per_vhost_msg_store-logs
+        path: ct-per_vhost_msg_store-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_msg_store [mixed v3.7.28]
       run: |
-        mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
+        mkdir ct-per_vhost_msg_store-logs-v3.7.28 && chmod 777 ct-per_vhost_msg_store-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_disk_monitor \
+          --env CT_SUITE=per_vhost_msg_store \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_disk_monitor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.7.28
+        path: ct-per_vhost_msg_store-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_msg_store [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_msg_store-logs-v3.8.9 && chmod 777 ct-per_vhost_msg_store-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_msg_store \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_msg_store-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_msg_store-logs-mixed-v3.8.9
+        path: ct-per_vhost_msg_store-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-per_vhost_queue_limit:
+    name: rabbit-ct-per_vhost_queue_limit
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-per_vhost_queue_limit
+      run: |
+        mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_queue_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_disk_monitor-logs
-        path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_gen_server2
+        name: rabbit-ct-per_vhost_queue_limit-logs
+        path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_queue_limit [mixed v3.7.28]
       run: |
-        mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
+        mkdir ct-per_vhost_queue_limit-logs-v3.7.28 && chmod 777 ct-per_vhost_queue_limit-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_gen_server2 \
+          --env CT_SUITE=per_vhost_queue_limit \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_gen_server2-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.7.28
+        path: ct-per_vhost_queue_limit-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-per_vhost_queue_limit [mixed v3.8.9]
+      run: |
+        mkdir ct-per_vhost_queue_limit-logs-v3.8.9 && chmod 777 ct-per_vhost_queue_limit-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=per_vhost_queue_limit \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-per_vhost_queue_limit-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-per_vhost_queue_limit-logs-mixed-v3.8.9
+        path: ct-per_vhost_queue_limit-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-policy:
+    name: rabbit-ct-policy
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-policy
+      run: |
+        mkdir ct-policy-logs && chmod 777 ct-policy-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=policy \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-policy-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_gen_server2-logs
-        path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-config_schema
+        name: rabbit-ct-policy-logs
+        path: ct-policy-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-policy [mixed v3.7.28]
       run: |
-        mkdir ct-config_schema-logs && chmod 777 ct-config_schema-logs
+        mkdir ct-policy-logs-v3.7.28 && chmod 777 ct-policy-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=config_schema \
+          --env CT_SUITE=policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-config_schema-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-policy-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-policy-logs-mixed-v3.7.28
+        path: ct-policy-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-policy [mixed v3.8.9]
+      run: |
+        mkdir ct-policy-logs-v3.8.9 && chmod 777 ct-policy-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=policy \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-policy-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-policy-logs-mixed-v3.8.9
+        path: ct-policy-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-priority_queue:
+    name: rabbit-ct-priority_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-priority_queue
+      run: |
+        mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-priority_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-config_schema-logs
-        path: ct-config_schema-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_credit_flow
+        name: rabbit-ct-priority_queue-logs
+        path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue [mixed v3.7.28]
       run: |
-        mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
+        mkdir ct-priority_queue-logs-v3.7.28 && chmod 777 ct-priority_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_credit_flow \
+          --env CT_SUITE=priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_credit_flow-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-priority_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue-logs-mixed-v3.7.28
+        path: ct-priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-priority_queue-logs-v3.8.9 && chmod 777 ct-priority_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-priority_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue-logs-mixed-v3.8.9
+        path: ct-priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-priority_queue_recovery:
+    name: rabbit-ct-priority_queue_recovery
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-priority_queue_recovery
+      run: |
+        mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue_recovery \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-priority_queue_recovery-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_credit_flow-logs
-        path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_vm_memory_monitor
+        name: rabbit-ct-priority_queue_recovery-logs
+        path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue_recovery [mixed v3.7.28]
       run: |
-        mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
+        mkdir ct-priority_queue_recovery-logs-v3.7.28 && chmod 777 ct-priority_queue_recovery-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_vm_memory_monitor \
+          --env CT_SUITE=priority_queue_recovery \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_vm_memory_monitor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-priority_queue_recovery-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.7.28
+        path: ct-priority_queue_recovery-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-priority_queue_recovery [mixed v3.8.9]
+      run: |
+        mkdir ct-priority_queue_recovery-logs-v3.8.9 && chmod 777 ct-priority_queue_recovery-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=priority_queue_recovery \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-priority_queue_recovery-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-priority_queue_recovery-logs-mixed-v3.8.9
+        path: ct-priority_queue_recovery-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-product_info:
+    name: rabbit-ct-product_info
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-product_info
+      run: |
+        mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=product_info \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-product_info-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_vm_memory_monitor-logs
-        path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-mirrored_supervisor
+        name: rabbit-ct-product_info-logs
+        path: ct-product_info-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-product_info [mixed v3.7.28]
       run: |
-        mkdir ct-mirrored_supervisor-logs && chmod 777 ct-mirrored_supervisor-logs
+        mkdir ct-product_info-logs-v3.7.28 && chmod 777 ct-product_info-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=mirrored_supervisor \
+          --env CT_SUITE=product_info \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-mirrored_supervisor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-product_info-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-product_info-logs-mixed-v3.7.28
+        path: ct-product_info-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-product_info [mixed v3.8.9]
+      run: |
+        mkdir ct-product_info-logs-v3.8.9 && chmod 777 ct-product_info-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=product_info \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-product_info-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-product_info-logs-mixed-v3.8.9
+        path: ct-product_info-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-proxy_protocol:
+    name: rabbit-ct-proxy_protocol
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-proxy_protocol
+      run: |
+        mkdir ct-proxy_protocol-logs && chmod 777 ct-proxy_protocol-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-proxy_protocol-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-mirrored_supervisor-logs
-        path: ct-mirrored_supervisor-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-definition_import-plus-9-more:
-    name: rabbit-ct-definition_import-plus-9-more
+        name: rabbit-ct-proxy_protocol-logs
+        path: ct-proxy_protocol-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-proxy_protocol [mixed v3.7.28]
+      run: |
+        mkdir ct-proxy_protocol-logs-v3.7.28 && chmod 777 ct-proxy_protocol-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-proxy_protocol-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-proxy_protocol-logs-mixed-v3.7.28
+        path: ct-proxy_protocol-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-proxy_protocol [mixed v3.8.9]
+      run: |
+        mkdir ct-proxy_protocol-logs-v3.8.9 && chmod 777 ct-proxy_protocol-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=proxy_protocol \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-proxy_protocol-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-proxy_protocol-logs-mixed-v3.8.9
+        path: ct-proxy_protocol-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-publisher_confirms_parallel:
+    name: rabbit-ct-publisher_confirms_parallel
     needs:
     - prepare
     - rabbit-checks
@@ -1452,23 +3583,74 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-definition_import
+    - name: RUN ct-publisher_confirms_parallel
       run: |
-        mkdir ct-definition_import-logs && chmod 777 ct-definition_import-logs
+        mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=definition_import \
+          --env CT_SUITE=publisher_confirms_parallel \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-definition_import-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-definition_import-logs
-        path: ct-definition_import-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-publisher_confirms_parallel-logs
+        path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-publisher_confirms_parallel [mixed v3.7.28]
+      run: |
+        mkdir ct-publisher_confirms_parallel-logs-v3.7.28 && chmod 777 ct-publisher_confirms_parallel-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=publisher_confirms_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.7.28
+        path: ct-publisher_confirms_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-publisher_confirms_parallel [mixed v3.8.9]
+      run: |
+        mkdir ct-publisher_confirms_parallel-logs-v3.8.9 && chmod 777 ct-publisher_confirms_parallel-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=publisher_confirms_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-publisher_confirms_parallel-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-publisher_confirms_parallel-logs-mixed-v3.8.9
+        path: ct-publisher_confirms_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_length_limits:
+    name: rabbit-ct-queue_length_limits
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-queue_length_limits
       run: |
         mkdir ct-queue_length_limits-logs && chmod 777 ct-queue_length_limits-logs
@@ -1486,91 +3668,533 @@ jobs:
       with:
         name: rabbit-ct-queue_length_limits-logs
         path: ct-queue_length_limits-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-cluster
+    - name: RUN ct-queue_length_limits [mixed v3.7.28]
       run: |
-        mkdir ct-cluster-logs && chmod 777 ct-cluster-logs
+        mkdir ct-queue_length_limits-logs-v3.7.28 && chmod 777 ct-queue_length_limits-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=cluster \
+          --env CT_SUITE=queue_length_limits \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-cluster-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_length_limits-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_length_limits-logs-mixed-v3.7.28
+        path: ct-queue_length_limits-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_length_limits [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_length_limits-logs-v3.8.9 && chmod 777 ct-queue_length_limits-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_length_limits \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_length_limits-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_length_limits-logs-mixed-v3.8.9
+        path: ct-queue_length_limits-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_master_location:
+    name: rabbit-ct-queue_master_location
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_master_location
+      run: |
+        mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_master_location \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_master_location-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-cluster-logs
-        path: ct-cluster-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-list_queues_online_and_offline
+        name: rabbit-ct-queue_master_location-logs
+        path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_master_location [mixed v3.7.28]
       run: |
-        mkdir ct-list_queues_online_and_offline-logs && chmod 777 ct-list_queues_online_and_offline-logs
+        mkdir ct-queue_master_location-logs-v3.7.28 && chmod 777 ct-queue_master_location-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=list_queues_online_and_offline \
+          --env CT_SUITE=queue_master_location \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-list_queues_online_and_offline-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_master_location-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_master_location-logs-mixed-v3.7.28
+        path: ct-queue_master_location-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_master_location [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_master_location-logs-v3.8.9 && chmod 777 ct-queue_master_location-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_master_location \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_master_location-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_master_location-logs-mixed-v3.8.9
+        path: ct-queue_master_location-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_parallel:
+    name: rabbit-ct-queue_parallel
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_parallel
+      run: |
+        mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_parallel-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-list_queues_online_and_offline-logs
-        path: ct-list_queues_online_and_offline-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmq_queues_cli_integration
+        name: rabbit-ct-queue_parallel-logs
+        path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_parallel [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
+        mkdir ct-queue_parallel-logs-v3.7.28 && chmod 777 ct-queue_parallel-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env CT_SUITE=queue_parallel \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_parallel-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_parallel-logs-mixed-v3.7.28
+        path: ct-queue_parallel-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_parallel [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_parallel-logs-v3.8.9 && chmod 777 ct-queue_parallel-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_parallel \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_parallel-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_parallel-logs-mixed-v3.8.9
+        path: ct-queue_parallel-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-queue_type:
+    name: rabbit-ct-queue_type
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-queue_type
+      run: |
+        mkdir ct-queue_type-logs && chmod 777 ct-queue_type-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_type \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-queue_type-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmq_queues_cli_integration-logs
-        path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-list_consumers_sanity_check
+        name: rabbit-ct-queue_type-logs
+        path: ct-queue_type-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_type [mixed v3.7.28]
       run: |
-        mkdir ct-list_consumers_sanity_check-logs && chmod 777 ct-list_consumers_sanity_check-logs
+        mkdir ct-queue_type-logs-v3.7.28 && chmod 777 ct-queue_type-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=list_consumers_sanity_check \
+          --env CT_SUITE=queue_type \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-list_consumers_sanity_check-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-queue_type-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_type-logs-mixed-v3.7.28
+        path: ct-queue_type-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-queue_type [mixed v3.8.9]
+      run: |
+        mkdir ct-queue_type-logs-v3.8.9 && chmod 777 ct-queue_type-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=queue_type \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-queue_type-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-queue_type-logs-mixed-v3.8.9
+        path: ct-queue_type-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-quorum_queue:
+    name: rabbit-ct-quorum_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-quorum_queue
+      run: |
+        mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=quorum_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-quorum_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-list_consumers_sanity_check-logs
-        path: ct-list_consumers_sanity_check-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-policy
+        name: rabbit-ct-quorum_queue-logs
+        path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-quorum_queue [mixed v3.7.28]
       run: |
-        mkdir ct-policy-logs && chmod 777 ct-policy-logs
+        mkdir ct-quorum_queue-logs-v3.7.28 && chmod 777 ct-quorum_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=policy \
+          --env CT_SUITE=quorum_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-policy-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-quorum_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-quorum_queue-logs-mixed-v3.7.28
+        path: ct-quorum_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-quorum_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-quorum_queue-logs-v3.8.9 && chmod 777 ct-quorum_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=quorum_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-quorum_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-quorum_queue-logs-mixed-v3.8.9
+        path: ct-quorum_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_confirms:
+    name: rabbit-ct-rabbit_confirms
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_confirms
+      run: |
+        mkdir ct-rabbit_confirms-logs && chmod 777 ct-rabbit_confirms-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_confirms-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-policy-logs
-        path: ct-policy-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-rabbit_confirms-logs
+        path: ct-rabbit_confirms-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_confirms [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_confirms-logs-v3.7.28 && chmod 777 ct-rabbit_confirms-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_confirms-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_confirms-logs-mixed-v3.7.28
+        path: ct-rabbit_confirms-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_confirms [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_confirms-logs-v3.8.9 && chmod 777 ct-rabbit_confirms-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_confirms \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_confirms-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_confirms-logs-mixed-v3.8.9
+        path: ct-rabbit_confirms-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_core_metrics_gc:
+    name: rabbit-ct-rabbit_core_metrics_gc
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_core_metrics_gc
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs
+        path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_core_metrics_gc [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs-v3.7.28 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.7.28
+        path: ct-rabbit_core_metrics_gc-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_core_metrics_gc [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_core_metrics_gc-logs-v3.8.9 && chmod 777 ct-rabbit_core_metrics_gc-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_core_metrics_gc-logs-mixed-v3.8.9
+        path: ct-rabbit_core_metrics_gc-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo:
+    name: rabbit-ct-rabbit_fifo
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo
+      run: |
+        mkdir ct-rabbit_fifo-logs && chmod 777 ct-rabbit_fifo-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs
+        path: ct-rabbit_fifo-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_fifo-logs-v3.7.28 && chmod 777 ct-rabbit_fifo-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo-logs-v3.8.9 && chmod 777 ct-rabbit_fifo-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_int:
+    name: rabbit-ct-rabbit_fifo_int
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-rabbit_fifo_int
       run: |
         mkdir ct-rabbit_fifo_int-logs && chmod 777 ct-rabbit_fifo_int-logs
@@ -1588,42 +4212,180 @@ jobs:
       with:
         name: rabbit-ct-rabbit_fifo_int-logs
         path: ct-rabbit_fifo_int-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_access_control_authn_authz_context_propagation
+    - name: RUN ct-rabbit_fifo_int [mixed v3.7.28]
       run: |
-        mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
+        mkdir ct-rabbit_fifo_int-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_int-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env CT_SUITE=rabbit_fifo_int \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_int-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_int-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_int [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_int-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_int-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_int \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_int-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_int-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_int-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_prop:
+    name: rabbit-ct-rabbit_fifo_prop
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo_prop
+      run: |
+        mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
-        path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-disconnect_detected_during_alarm
+        name: rabbit-ct-rabbit_fifo_prop-logs
+        path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_prop [mixed v3.7.28]
       run: |
-        mkdir ct-disconnect_detected_during_alarm-logs && chmod 777 ct-disconnect_detected_during_alarm-logs
+        mkdir ct-rabbit_fifo_prop-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_prop-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=disconnect_detected_during_alarm \
+          --env CT_SUITE=rabbit_fifo_prop \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-disconnect_detected_during_alarm-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_prop [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_prop-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_prop-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_prop-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_prop-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_fifo_v0:
+    name: rabbit-ct-rabbit_fifo_v0
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_fifo_v0
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs && chmod 777 ct-rabbit_fifo_v0-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-disconnect_detected_during_alarm-logs
-        path: ct-disconnect_detected_during_alarm-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-unit_stats_and_metrics-plus-8-more:
-    name: rabbit-ct-unit_stats_and_metrics-plus-8-more
+        name: rabbit-ct-rabbit_fifo_v0-logs
+        path: ct-rabbit_fifo_v0-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_v0 [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs-v3.7.28 && chmod 777 ct-rabbit_fifo_v0-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.7.28
+        path: ct-rabbit_fifo_v0-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_fifo_v0 [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_fifo_v0-logs-v3.8.9 && chmod 777 ct-rabbit_fifo_v0-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_fifo_v0 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_fifo_v0-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_fifo_v0-logs-mixed-v3.8.9
+        path: ct-rabbit_fifo_v0-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_msg_record:
+    name: rabbit-ct-rabbit_msg_record
     needs:
     - prepare
     - rabbit-checks
@@ -1637,57 +4399,754 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-unit_stats_and_metrics
+    - name: RUN ct-rabbit_msg_record
       run: |
-        mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
+        mkdir ct-rabbit_msg_record-logs && chmod 777 ct-rabbit_msg_record-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_stats_and_metrics \
+          --env CT_SUITE=rabbit_msg_record \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_stats_and_metrics-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-rabbit_msg_record-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_stats_and_metrics-logs
-        path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_channel_tracking
+        name: rabbit-ct-rabbit_msg_record-logs
+        path: ct-rabbit_msg_record-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_msg_record [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_channel_tracking-logs && chmod 777 ct-per_user_connection_channel_tracking-logs
+        mkdir ct-rabbit_msg_record-logs-v3.7.28 && chmod 777 ct-rabbit_msg_record-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_channel_tracking \
+          --env CT_SUITE=rabbit_msg_record \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_channel_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_msg_record-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.7.28
+        path: ct-rabbit_msg_record-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_msg_record [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_msg_record-logs-v3.8.9 && chmod 777 ct-rabbit_msg_record-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_msg_record \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_msg_record-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_msg_record-logs-mixed-v3.8.9
+        path: ct-rabbit_msg_record-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbit_stream_queue:
+    name: rabbit-ct-rabbit_stream_queue
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbit_stream_queue
+      run: |
+        mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_stream_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_channel_tracking-logs
-        path: ct-per_user_connection_channel_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-priority_queue_recovery
+        name: rabbit-ct-rabbit_stream_queue-logs
+        path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_stream_queue [mixed v3.7.28]
       run: |
-        mkdir ct-priority_queue_recovery-logs && chmod 777 ct-priority_queue_recovery-logs
+        mkdir ct-rabbit_stream_queue-logs-v3.7.28 && chmod 777 ct-rabbit_stream_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=priority_queue_recovery \
+          --env CT_SUITE=rabbit_stream_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-priority_queue_recovery-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.7.28
+        path: ct-rabbit_stream_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbit_stream_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbit_stream_queue-logs-v3.8.9 && chmod 777 ct-rabbit_stream_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbit_stream_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbit_stream_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbit_stream_queue-logs-mixed-v3.8.9
+        path: ct-rabbit_stream_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmq_queues_cli_integration:
+    name: rabbit-ct-rabbitmq_queues_cli_integration
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmq_queues_cli_integration
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs && chmod 777 ct-rabbitmq_queues_cli_integration-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-priority_queue_recovery-logs
-        path: ct-priority_queue_recovery-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs
+        path: ct-rabbitmq_queues_cli_integration-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs-v3.7.28 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.7.28
+        path: ct-rabbitmq_queues_cli_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmq_queues_cli_integration [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmq_queues_cli_integration-logs-v3.8.9 && chmod 777 ct-rabbitmq_queues_cli_integration-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmq_queues_cli_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmq_queues_cli_integration-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmq_queues_cli_integration-logs-mixed-v3.8.9
+        path: ct-rabbitmq_queues_cli_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmqctl_integration:
+    name: rabbit-ct-rabbitmqctl_integration
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmqctl_integration
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs
+        path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_integration [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_integration-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.7.28
+        path: ct-rabbitmqctl_integration-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_integration [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmqctl_integration-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_integration-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_integration \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmqctl_integration-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_integration-logs-mixed-v3.8.9
+        path: ct-rabbitmqctl_integration-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-rabbitmqctl_shutdown:
+    name: rabbit-ct-rabbitmqctl_shutdown
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-rabbitmqctl_shutdown
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs && chmod 777 ct-rabbitmqctl_shutdown-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs
+        path: ct-rabbitmqctl_shutdown-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_shutdown [mixed v3.7.28]
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs-v3.7.28 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.7.28
+        path: ct-rabbitmqctl_shutdown-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-rabbitmqctl_shutdown [mixed v3.8.9]
+      run: |
+        mkdir ct-rabbitmqctl_shutdown-logs-v3.8.9 && chmod 777 ct-rabbitmqctl_shutdown-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=rabbitmqctl_shutdown \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-rabbitmqctl_shutdown-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-rabbitmqctl_shutdown-logs-mixed-v3.8.9
+        path: ct-rabbitmqctl_shutdown-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-signal_handling:
+    name: rabbit-ct-signal_handling
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-signal_handling
+      run: |
+        mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-signal_handling-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs
+        path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-signal_handling [mixed v3.7.28]
+      run: |
+        mkdir ct-signal_handling-logs-v3.7.28 && chmod 777 ct-signal_handling-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-signal_handling-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs-mixed-v3.7.28
+        path: ct-signal_handling-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-signal_handling [mixed v3.8.9]
+      run: |
+        mkdir ct-signal_handling-logs-v3.8.9 && chmod 777 ct-signal_handling-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=signal_handling \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-signal_handling-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-signal_handling-logs-mixed-v3.8.9
+        path: ct-signal_handling-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-simple_ha:
+    name: rabbit-ct-simple_ha
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-simple_ha
+      run: |
+        mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-simple_ha-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs
+        path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-simple_ha [mixed v3.7.28]
+      run: |
+        mkdir ct-simple_ha-logs-v3.7.28 && chmod 777 ct-simple_ha-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-simple_ha-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs-mixed-v3.7.28
+        path: ct-simple_ha-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-simple_ha [mixed v3.8.9]
+      run: |
+        mkdir ct-simple_ha-logs-v3.8.9 && chmod 777 ct-simple_ha-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=simple_ha \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-simple_ha-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-simple_ha-logs-mixed-v3.8.9
+        path: ct-simple_ha-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-single_active_consumer:
+    name: rabbit-ct-single_active_consumer
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-single_active_consumer
+      run: |
+        mkdir ct-single_active_consumer-logs && chmod 777 ct-single_active_consumer-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-single_active_consumer-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs
+        path: ct-single_active_consumer-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-single_active_consumer [mixed v3.7.28]
+      run: |
+        mkdir ct-single_active_consumer-logs-v3.7.28 && chmod 777 ct-single_active_consumer-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-single_active_consumer-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs-mixed-v3.7.28
+        path: ct-single_active_consumer-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-single_active_consumer [mixed v3.8.9]
+      run: |
+        mkdir ct-single_active_consumer-logs-v3.8.9 && chmod 777 ct-single_active_consumer-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=single_active_consumer \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-single_active_consumer-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-single_active_consumer-logs-mixed-v3.8.9
+        path: ct-single_active_consumer-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-sync_detection:
+    name: rabbit-ct-sync_detection
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-sync_detection
+      run: |
+        mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-sync_detection-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs
+        path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-sync_detection [mixed v3.7.28]
+      run: |
+        mkdir ct-sync_detection-logs-v3.7.28 && chmod 777 ct-sync_detection-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-sync_detection-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs-mixed-v3.7.28
+        path: ct-sync_detection-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-sync_detection [mixed v3.8.9]
+      run: |
+        mkdir ct-sync_detection-logs-v3.8.9 && chmod 777 ct-sync_detection-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=sync_detection \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-sync_detection-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-sync_detection-logs-mixed-v3.8.9
+        path: ct-sync_detection-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-term_to_binary_compat_prop:
+    name: rabbit-ct-term_to_binary_compat_prop
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-term_to_binary_compat_prop
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs && chmod 777 ct-term_to_binary_compat_prop-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs
+        path: ct-term_to_binary_compat_prop-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-term_to_binary_compat_prop [mixed v3.7.28]
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs-v3.7.28 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.7.28
+        path: ct-term_to_binary_compat_prop-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-term_to_binary_compat_prop [mixed v3.8.9]
+      run: |
+        mkdir ct-term_to_binary_compat_prop-logs-v3.8.9 && chmod 777 ct-term_to_binary_compat_prop-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=term_to_binary_compat_prop \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-term_to_binary_compat_prop-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-term_to_binary_compat_prop-logs-mixed-v3.8.9
+        path: ct-term_to_binary_compat_prop-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-topic_permission:
+    name: rabbit-ct-topic_permission
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-topic_permission
+      run: |
+        mkdir ct-topic_permission-logs && chmod 777 ct-topic_permission-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-topic_permission-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs
+        path: ct-topic_permission-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-topic_permission [mixed v3.7.28]
+      run: |
+        mkdir ct-topic_permission-logs-v3.7.28 && chmod 777 ct-topic_permission-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-topic_permission-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs-mixed-v3.7.28
+        path: ct-topic_permission-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-topic_permission [mixed v3.8.9]
+      run: |
+        mkdir ct-topic_permission-logs-v3.8.9 && chmod 777 ct-topic_permission-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=topic_permission \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-topic_permission-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-topic_permission-logs-mixed-v3.8.9
+        path: ct-topic_permission-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control:
+    name: rabbit-ct-unit_access_control
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_access_control
       run: |
         mkdir ct-unit_access_control-logs && chmod 777 ct-unit_access_control-logs
@@ -1705,40 +5164,261 @@ jobs:
       with:
         name: rabbit-ct-unit_access_control-logs
         path: ct-unit_access_control-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-product_info
+    - name: RUN ct-unit_access_control [mixed v3.7.28]
       run: |
-        mkdir ct-product_info-logs && chmod 777 ct-product_info-logs
+        mkdir ct-unit_access_control-logs-v3.7.28 && chmod 777 ct-unit_access_control-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=product_info \
+          --env CT_SUITE=unit_access_control \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-product_info-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control-logs-mixed-v3.7.28
+        path: ct-unit_access_control-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control-logs-v3.8.9 && chmod 777 ct-unit_access_control-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control-logs-mixed-v3.8.9
+        path: ct-unit_access_control-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control_authn_authz_context_propagation:
+    name: rabbit-ct-unit_access_control_authn_authz_context_propagation
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation
+      run: |
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-product_info-logs
-        path: ct-product_info-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_file_handle_cache
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs
+        path: ct-unit_access_control_authn_authz_context_propagation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.7.28]
       run: |
-        mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_file_handle_cache \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_file_handle_cache-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.7.28
+        path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_authn_authz_context_propagation [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9 && chmod 777 ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_authn_authz_context_propagation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_authn_authz_context_propagation-logs-mixed-v3.8.9
+        path: ct-unit_access_control_authn_authz_context_propagation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_access_control_credential_validation:
+    name: rabbit-ct-unit_access_control_credential_validation
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_access_control_credential_validation
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs && chmod 777 ct-unit_access_control_credential_validation-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_file_handle_cache-logs
-        path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-unit_access_control_credential_validation-logs
+        path: ct-unit_access_control_credential_validation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_credential_validation [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs-v3.7.28 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.7.28
+        path: ct-unit_access_control_credential_validation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_access_control_credential_validation [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_access_control_credential_validation-logs-v3.8.9 && chmod 777 ct-unit_access_control_credential_validation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_access_control_credential_validation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_access_control_credential_validation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_access_control_credential_validation-logs-mixed-v3.8.9
+        path: ct-unit_access_control_credential_validation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_amqp091_content_framing:
+    name: rabbit-ct-unit_amqp091_content_framing
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_amqp091_content_framing
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs && chmod 777 ct-unit_amqp091_content_framing-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs
+        path: ct-unit_amqp091_content_framing-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_content_framing [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs-v3.7.28 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.7.28
+        path: ct-unit_amqp091_content_framing-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_content_framing [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_amqp091_content_framing-logs-v3.8.9 && chmod 777 ct-unit_amqp091_content_framing-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_content_framing \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_amqp091_content_framing-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_content_framing-logs-mixed-v3.8.9
+        path: ct-unit_amqp091_content_framing-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_amqp091_server_properties:
+    name: rabbit-ct-unit_amqp091_server_properties
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_amqp091_server_properties
       run: |
         mkdir ct-unit_amqp091_server_properties-logs && chmod 777 ct-unit_amqp091_server_properties-logs
@@ -1756,6 +5436,261 @@ jobs:
       with:
         name: rabbit-ct-unit_amqp091_server_properties-logs
         path: ct-unit_amqp091_server_properties-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_server_properties [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_amqp091_server_properties-logs-v3.7.28 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_server_properties \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_amqp091_server_properties-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.7.28
+        path: ct-unit_amqp091_server_properties-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_amqp091_server_properties [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_amqp091_server_properties-logs-v3.8.9 && chmod 777 ct-unit_amqp091_server_properties-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_amqp091_server_properties \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_amqp091_server_properties-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_amqp091_server_properties-logs-mixed-v3.8.9
+        path: ct-unit_amqp091_server_properties-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_app_management:
+    name: rabbit-ct-unit_app_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_app_management
+      run: |
+        mkdir ct-unit_app_management-logs && chmod 777 ct-unit_app_management-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_app_management-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs
+        path: ct-unit_app_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_app_management [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_app_management-logs-v3.7.28 && chmod 777 ct-unit_app_management-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_app_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs-mixed-v3.7.28
+        path: ct-unit_app_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_app_management [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_app_management-logs-v3.8.9 && chmod 777 ct-unit_app_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_app_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_app_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_app_management-logs-mixed-v3.8.9
+        path: ct-unit_app_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_cluster_formation_locking_mocks:
+    name: rabbit-ct-unit_cluster_formation_locking_mocks
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_cluster_formation_locking_mocks
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs && chmod 777 ct-unit_cluster_formation_locking_mocks-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs
+        path: ct-unit_cluster_formation_locking_mocks-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.7.28 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.7.28
+        path: ct-unit_cluster_formation_locking_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_cluster_formation_locking_mocks [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_cluster_formation_locking_mocks-logs-v3.8.9 && chmod 777 ct-unit_cluster_formation_locking_mocks-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_cluster_formation_locking_mocks \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_cluster_formation_locking_mocks-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_cluster_formation_locking_mocks-logs-mixed-v3.8.9
+        path: ct-unit_cluster_formation_locking_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_collections:
+    name: rabbit-ct-unit_collections
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_collections
+      run: |
+        mkdir ct-unit_collections-logs && chmod 777 ct-unit_collections-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_collections-logs:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs
+        path: ct-unit_collections-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_collections [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_collections-logs-v3.7.28 && chmod 777 ct-unit_collections-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_collections-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs-mixed-v3.7.28
+        path: ct-unit_collections-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_collections [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_collections-logs-v3.8.9 && chmod 777 ct-unit_collections-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_collections \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_collections-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_collections-logs-mixed-v3.8.9
+        path: ct-unit_collections-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_config_value_encryption:
+    name: rabbit-ct-unit_config_value_encryption
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
     - name: RUN ct-unit_config_value_encryption
       run: |
         mkdir ct-unit_config_value_encryption-logs && chmod 777 ct-unit_config_value_encryption-logs
@@ -1773,25 +5708,44 @@ jobs:
       with:
         name: rabbit-ct-unit_config_value_encryption-logs
         path: ct-unit_config_value_encryption-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbitmqctl_integration
+    - name: RUN ct-unit_config_value_encryption [mixed v3.7.28]
       run: |
-        mkdir ct-rabbitmqctl_integration-logs && chmod 777 ct-rabbitmqctl_integration-logs
+        mkdir ct-unit_config_value_encryption-logs-v3.7.28 && chmod 777 ct-unit_config_value_encryption-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbitmqctl_integration \
+          --env CT_SUITE=unit_config_value_encryption \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbitmqctl_integration-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_config_value_encryption-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbitmqctl_integration-logs
-        path: ct-rabbitmqctl_integration-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-feature_flags-plus-7-more:
-    name: rabbit-ct-feature_flags-plus-7-more
+        name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.7.28
+        path: ct-unit_config_value_encryption-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_config_value_encryption [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_config_value_encryption-logs-v3.8.9 && chmod 777 ct-unit_config_value_encryption-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_config_value_encryption \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_config_value_encryption-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_config_value_encryption-logs-mixed-v3.8.9
+        path: ct-unit_config_value_encryption-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_connection_tracking:
+    name: rabbit-ct-unit_connection_tracking
     needs:
     - prepare
     - rabbit-checks
@@ -1805,144 +5759,197 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-feature_flags
+    - name: RUN ct-unit_connection_tracking
       run: |
-        mkdir ct-feature_flags-logs && chmod 777 ct-feature_flags-logs
+        mkdir ct-unit_connection_tracking-logs && chmod 777 ct-unit_connection_tracking-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=feature_flags \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-feature_flags-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_connection_tracking-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-feature_flags-logs
-        path: ct-feature_flags-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-channel_interceptor
+        name: rabbit-ct-unit_connection_tracking-logs
+        path: ct-unit_connection_tracking-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_connection_tracking [mixed v3.7.28]
       run: |
-        mkdir ct-channel_interceptor-logs && chmod 777 ct-channel_interceptor-logs
+        mkdir ct-unit_connection_tracking-logs-v3.7.28 && chmod 777 ct-unit_connection_tracking-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=channel_interceptor \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-channel_interceptor-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_connection_tracking-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-channel_interceptor-logs
-        path: ct-channel_interceptor-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-channel_operation_timeout
+        name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.7.28
+        path: ct-unit_connection_tracking-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_connection_tracking [mixed v3.8.9]
       run: |
-        mkdir ct-channel_operation_timeout-logs && chmod 777 ct-channel_operation_timeout-logs
+        mkdir ct-unit_connection_tracking-logs-v3.8.9 && chmod 777 ct-unit_connection_tracking-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=channel_operation_timeout \
+          --env CT_SUITE=unit_connection_tracking \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-channel_operation_timeout-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_connection_tracking-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-channel_operation_timeout-logs
-        path: ct-channel_operation_timeout-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-unit_log_management
+        name: rabbit-ct-unit_connection_tracking-logs-mixed-v3.8.9
+        path: ct-unit_connection_tracking-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_credit_flow:
+    name: rabbit-ct-unit_credit_flow
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_credit_flow
+      run: |
+        mkdir ct-unit_credit_flow-logs && chmod 777 ct-unit_credit_flow-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=unit_log_management \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-unit_log_management-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_credit_flow-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-unit_log_management-logs
-        path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-many_node_ha
+        name: rabbit-ct-unit_credit_flow-logs
+        path: ct-unit_credit_flow-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_credit_flow [mixed v3.7.28]
       run: |
-        mkdir ct-many_node_ha-logs && chmod 777 ct-many_node_ha-logs
+        mkdir ct-unit_credit_flow-logs-v3.7.28 && chmod 777 ct-unit_credit_flow-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=many_node_ha \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-many_node_ha-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_credit_flow-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-many_node_ha-logs
-        path: ct-many_node_ha-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-upgrade_preparation
+        name: rabbit-ct-unit_credit_flow-logs-mixed-v3.7.28
+        path: ct-unit_credit_flow-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_credit_flow [mixed v3.8.9]
       run: |
-        mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
+        mkdir ct-unit_credit_flow-logs-v3.8.9 && chmod 777 ct-unit_credit_flow-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=upgrade_preparation \
+          --env CT_SUITE=unit_credit_flow \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-upgrade_preparation-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_credit_flow-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-upgrade_preparation-logs
-        path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-consumer_timeout
+        name: rabbit-ct-unit_credit_flow-logs-mixed-v3.8.9
+        path: ct-unit_credit_flow-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_disk_monitor:
+    name: rabbit-ct-unit_disk_monitor
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-consumer_timeout-logs && chmod 777 ct-consumer_timeout-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_disk_monitor
+      run: |
+        mkdir ct-unit_disk_monitor-logs && chmod 777 ct-unit_disk_monitor-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=consumer_timeout \
+          --env CT_SUITE=unit_disk_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-consumer_timeout-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_disk_monitor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-consumer_timeout-logs
-        path: ct-consumer_timeout-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_connection_limit_partitions
+        name: rabbit-ct-unit_disk_monitor-logs
+        path: ct-unit_disk_monitor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor [mixed v3.7.28]
       run: |
-        mkdir ct-per_vhost_connection_limit_partitions-logs && chmod 777 ct-per_vhost_connection_limit_partitions-logs
+        mkdir ct-unit_disk_monitor-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_connection_limit_partitions \
+          --env CT_SUITE=unit_disk_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_connection_limit_partitions-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_disk_monitor-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_connection_limit_partitions-logs
-        path: ct-per_vhost_connection_limit_partitions-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-crashing_queues-plus-5-more:
-    name: rabbit-ct-crashing_queues-plus-5-more
+        name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.7.28
+        path: ct-unit_disk_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_disk_monitor-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_disk_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_disk_monitor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_disk_monitor-logs-mixed-v3.8.9
+        path: ct-unit_disk_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_disk_monitor_mocks:
+    name: rabbit-ct-unit_disk_monitor_mocks
     needs:
     - prepare
     - rabbit-checks
@@ -1956,110 +5963,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-crashing_queues
+    - name: RUN ct-unit_disk_monitor_mocks
       run: |
-        mkdir ct-crashing_queues-logs && chmod 777 ct-crashing_queues-logs
+        mkdir ct-unit_disk_monitor_mocks-logs && chmod 777 ct-unit_disk_monitor_mocks-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=crashing_queues \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-crashing_queues-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-crashing_queues-logs
-        path: ct-crashing_queues-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-lazy_queue
+        name: rabbit-ct-unit_disk_monitor_mocks-logs
+        path: ct-unit_disk_monitor_mocks-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor_mocks [mixed v3.7.28]
       run: |
-        mkdir ct-lazy_queue-logs && chmod 777 ct-lazy_queue-logs
+        mkdir ct-unit_disk_monitor_mocks-logs-v3.7.28 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=lazy_queue \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-lazy_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-lazy_queue-logs
-        path: ct-lazy_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-sync_detection
+        name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.7.28
+        path: ct-unit_disk_monitor_mocks-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_disk_monitor_mocks [mixed v3.8.9]
       run: |
-        mkdir ct-sync_detection-logs && chmod 777 ct-sync_detection-logs
+        mkdir ct-unit_disk_monitor_mocks-logs-v3.8.9 && chmod 777 ct-unit_disk_monitor_mocks-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=sync_detection \
+          --env CT_SUITE=unit_disk_monitor_mocks \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-sync_detection-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_disk_monitor_mocks-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-sync_detection-logs
-        path: ct-sync_detection-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-publisher_confirms_parallel
+        name: rabbit-ct-unit_disk_monitor_mocks-logs-mixed-v3.8.9
+        path: ct-unit_disk_monitor_mocks-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_file_handle_cache:
+    name: rabbit-ct-unit_file_handle_cache
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-publisher_confirms_parallel-logs && chmod 777 ct-publisher_confirms_parallel-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_file_handle_cache
+      run: |
+        mkdir ct-unit_file_handle_cache-logs && chmod 777 ct-unit_file_handle_cache-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=publisher_confirms_parallel \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-publisher_confirms_parallel-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-publisher_confirms_parallel-logs
-        path: ct-publisher_confirms_parallel-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_user_connection_tracking
+        name: rabbit-ct-unit_file_handle_cache-logs
+        path: ct-unit_file_handle_cache-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_file_handle_cache [mixed v3.7.28]
       run: |
-        mkdir ct-per_user_connection_tracking-logs && chmod 777 ct-per_user_connection_tracking-logs
+        mkdir ct-unit_file_handle_cache-logs-v3.7.28 && chmod 777 ct-unit_file_handle_cache-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_user_connection_tracking \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_user_connection_tracking-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_user_connection_tracking-logs
-        path: ct-per_user_connection_tracking-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-peer_discovery_classic_config
+        name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.7.28
+        path: ct-unit_file_handle_cache-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_file_handle_cache [mixed v3.8.9]
       run: |
-        mkdir ct-peer_discovery_classic_config-logs && chmod 777 ct-peer_discovery_classic_config-logs
+        mkdir ct-unit_file_handle_cache-logs-v3.8.9 && chmod 777 ct-unit_file_handle_cache-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=peer_discovery_classic_config \
+          --env CT_SUITE=unit_file_handle_cache \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-peer_discovery_classic_config-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_file_handle_cache-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-peer_discovery_classic_config-logs
-        path: ct-peer_discovery_classic_config-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-per_vhost_queue_limit-plus-4-more:
-    name: rabbit-ct-per_vhost_queue_limit-plus-4-more
+        name: rabbit-ct-unit_file_handle_cache-logs-mixed-v3.8.9
+        path: ct-unit_file_handle_cache-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_gen_server2:
+    name: rabbit-ct-unit_gen_server2
     needs:
     - prepare
     - rabbit-checks
@@ -2073,93 +6099,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-per_vhost_queue_limit
+    - name: RUN ct-unit_gen_server2
       run: |
-        mkdir ct-per_vhost_queue_limit-logs && chmod 777 ct-per_vhost_queue_limit-logs
+        mkdir ct-unit_gen_server2-logs && chmod 777 ct-unit_gen_server2-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_queue_limit \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_queue_limit-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_gen_server2-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_queue_limit-logs
-        path: ct-per_vhost_queue_limit-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-confirms_rejects
+        name: rabbit-ct-unit_gen_server2-logs
+        path: ct-unit_gen_server2-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gen_server2 [mixed v3.7.28]
       run: |
-        mkdir ct-confirms_rejects-logs && chmod 777 ct-confirms_rejects-logs
+        mkdir ct-unit_gen_server2-logs-v3.7.28 && chmod 777 ct-unit_gen_server2-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=confirms_rejects \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-confirms_rejects-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_gen_server2-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-confirms_rejects-logs
-        path: ct-confirms_rejects-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-metrics
+        name: rabbit-ct-unit_gen_server2-logs-mixed-v3.7.28
+        path: ct-unit_gen_server2-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gen_server2 [mixed v3.8.9]
       run: |
-        mkdir ct-metrics-logs && chmod 777 ct-metrics-logs
+        mkdir ct-unit_gen_server2-logs-v3.8.9 && chmod 777 ct-unit_gen_server2-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=metrics \
+          --env CT_SUITE=unit_gen_server2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-metrics-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_gen_server2-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-metrics-logs
-        path: ct-metrics-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-signal_handling
+        name: rabbit-ct-unit_gen_server2-logs-mixed-v3.8.9
+        path: ct-unit_gen_server2-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_gm:
+    name: rabbit-ct-unit_gm
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-signal_handling-logs && chmod 777 ct-signal_handling-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_gm
+      run: |
+        mkdir ct-unit_gm-logs && chmod 777 ct-unit_gm-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=signal_handling \
+          --env CT_SUITE=unit_gm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-signal_handling-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_gm-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-signal_handling-logs
-        path: ct-signal_handling-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_fifo_prop
+        name: rabbit-ct-unit_gm-logs
+        path: ct-unit_gm-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gm [mixed v3.7.28]
       run: |
-        mkdir ct-rabbit_fifo_prop-logs && chmod 777 ct-rabbit_fifo_prop-logs
+        mkdir ct-unit_gm-logs-v3.7.28 && chmod 777 ct-unit_gm-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_fifo_prop \
+          --env CT_SUITE=unit_gm \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_fifo_prop-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_gm-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_fifo_prop-logs
-        path: ct-rabbit_fifo_prop-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dead_lettering-plus-3-more:
-    name: rabbit-ct-dead_lettering-plus-3-more
+        name: rabbit-ct-unit_gm-logs-mixed-v3.7.28
+        path: ct-unit_gm-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_gm [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_gm-logs-v3.8.9 && chmod 777 ct-unit_gm-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_gm \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_gm-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_gm-logs-mixed-v3.8.9
+        path: ct-unit_gm-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_log_config:
+    name: rabbit-ct-unit_log_config
     needs:
     - prepare
     - rabbit-checks
@@ -2173,76 +6235,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dead_lettering
+    - name: RUN ct-unit_log_config
       run: |
-        mkdir ct-dead_lettering-logs && chmod 777 ct-dead_lettering-logs
+        mkdir ct-unit_log_config-logs && chmod 777 ct-unit_log_config-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dead_lettering \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dead_lettering-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_log_config-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dead_lettering-logs
-        path: ct-dead_lettering-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-maintenance_mode
+        name: rabbit-ct-unit_log_config-logs
+        path: ct-unit_log_config-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_config [mixed v3.7.28]
       run: |
-        mkdir ct-maintenance_mode-logs && chmod 777 ct-maintenance_mode-logs
+        mkdir ct-unit_log_config-logs-v3.7.28 && chmod 777 ct-unit_log_config-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=maintenance_mode \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-maintenance_mode-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_log_config-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-maintenance_mode-logs
-        path: ct-maintenance_mode-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-vhost
+        name: rabbit-ct-unit_log_config-logs-mixed-v3.7.28
+        path: ct-unit_log_config-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_config [mixed v3.8.9]
       run: |
-        mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
+        mkdir ct-unit_log_config-logs-v3.8.9 && chmod 777 ct-unit_log_config-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=vhost \
+          --env CT_SUITE=unit_log_config \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-vhost-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_log_config-logs-v3.8.9:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-vhost-logs
-        path: ct-vhost-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-rabbit_core_metrics_gc
+        name: rabbit-ct-unit_log_config-logs-mixed-v3.8.9
+        path: ct-unit_log_config-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_log_management:
+    name: rabbit-ct-unit_log_management
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
       run: |
-        mkdir ct-rabbit_core_metrics_gc-logs && chmod 777 ct-rabbit_core_metrics_gc-logs
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_log_management
+      run: |
+        mkdir ct-unit_log_management-logs && chmod 777 ct-unit_log_management-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_core_metrics_gc \
+          --env CT_SUITE=unit_log_management \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_core_metrics_gc-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_log_management-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_core_metrics_gc-logs
-        path: ct-rabbit_core_metrics_gc-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dynamic_qq-plus-2-more:
-    name: rabbit-ct-dynamic_qq-plus-2-more
+        name: rabbit-ct-unit_log_management-logs
+        path: ct-unit_log_management-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_management [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_log_management-logs-v3.7.28 && chmod 777 ct-unit_log_management-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_log_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_log_management-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_log_management-logs-mixed-v3.7.28
+        path: ct-unit_log_management-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_log_management [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_log_management-logs-v3.8.9 && chmod 777 ct-unit_log_management-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_log_management \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_log_management-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_log_management-logs-mixed-v3.8.9
+        path: ct-unit_log_management-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_operator_policy:
+    name: rabbit-ct-unit_operator_policy
     needs:
     - prepare
     - rabbit-checks
@@ -2256,59 +6371,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dynamic_qq
+    - name: RUN ct-unit_operator_policy
       run: |
-        mkdir ct-dynamic_qq-logs && chmod 777 ct-dynamic_qq-logs
+        mkdir ct-unit_operator_policy-logs && chmod 777 ct-unit_operator_policy-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dynamic_qq \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dynamic_qq-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_operator_policy-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dynamic_qq-logs
-        path: ct-dynamic_qq-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-priority_queue
+        name: rabbit-ct-unit_operator_policy-logs
+        path: ct-unit_operator_policy-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_operator_policy [mixed v3.7.28]
       run: |
-        mkdir ct-priority_queue-logs && chmod 777 ct-priority_queue-logs
+        mkdir ct-unit_operator_policy-logs-v3.7.28 && chmod 777 ct-unit_operator_policy-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=priority_queue \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-priority_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_operator_policy-logs-v3.7.28:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
-    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-priority_queue-logs
-        path: ct-priority_queue-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-per_vhost_connection_limit
+        name: rabbit-ct-unit_operator_policy-logs-mixed-v3.7.28
+        path: ct-unit_operator_policy-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_operator_policy [mixed v3.8.9]
       run: |
-        mkdir ct-per_vhost_connection_limit-logs && chmod 777 ct-per_vhost_connection_limit-logs
+        mkdir ct-unit_operator_policy-logs-v3.8.9 && chmod 777 ct-unit_operator_policy-logs-v3.8.9
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=per_vhost_connection_limit \
+          --env CT_SUITE=unit_operator_policy \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-per_vhost_connection_limit-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_operator_policy-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_operator_policy-logs-mixed-v3.8.9
+        path: ct-unit_operator_policy-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_pg_local:
+    name: rabbit-ct-unit_pg_local
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_pg_local
+      run: |
+        mkdir ct-unit_pg_local-logs && chmod 777 ct-unit_pg_local-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_pg_local-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-per_vhost_connection_limit-logs
-        path: ct-per_vhost_connection_limit-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-queue_parallel-plus-2-more:
-    name: rabbit-ct-queue_parallel-plus-2-more
+        name: rabbit-ct-unit_pg_local-logs
+        path: ct-unit_pg_local-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_pg_local [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_pg_local-logs-v3.7.28 && chmod 777 ct-unit_pg_local-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_pg_local-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_pg_local-logs-mixed-v3.7.28
+        path: ct-unit_pg_local-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_pg_local [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_pg_local-logs-v3.8.9 && chmod 777 ct-unit_pg_local-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_pg_local \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_pg_local-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_pg_local-logs-mixed-v3.8.9
+        path: ct-unit_pg_local-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_plugin_directories:
+    name: rabbit-ct-unit_plugin_directories
     needs:
     - prepare
     - rabbit-checks
@@ -2322,59 +6507,197 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-queue_parallel
+    - name: RUN ct-unit_plugin_directories
       run: |
-        mkdir ct-queue_parallel-logs && chmod 777 ct-queue_parallel-logs
+        mkdir ct-unit_plugin_directories-logs && chmod 777 ct-unit_plugin_directories-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_parallel \
+          --env CT_SUITE=unit_plugin_directories \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_parallel-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_plugin_directories-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_parallel-logs
-        path: ct-queue_parallel-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-cluster_rename
+        name: rabbit-ct-unit_plugin_directories-logs
+        path: ct-unit_plugin_directories-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_directories [mixed v3.7.28]
       run: |
-        mkdir ct-cluster_rename-logs && chmod 777 ct-cluster_rename-logs
+        mkdir ct-unit_plugin_directories-logs-v3.7.28 && chmod 777 ct-unit_plugin_directories-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=cluster_rename \
+          --env CT_SUITE=unit_plugin_directories \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-cluster_rename-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_plugin_directories-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.7.28
+        path: ct-unit_plugin_directories-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_directories [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_plugin_directories-logs-v3.8.9 && chmod 777 ct-unit_plugin_directories-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_directories \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_plugin_directories-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_directories-logs-mixed-v3.8.9
+        path: ct-unit_plugin_directories-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_plugin_versioning:
+    name: rabbit-ct-unit_plugin_versioning
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_plugin_versioning
+      run: |
+        mkdir ct-unit_plugin_versioning-logs && chmod 777 ct-unit_plugin_versioning-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_versioning \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-cluster_rename-logs
-        path: ct-cluster_rename-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-backing_queue
+        name: rabbit-ct-unit_plugin_versioning-logs
+        path: ct-unit_plugin_versioning-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_versioning [mixed v3.7.28]
       run: |
-        mkdir ct-backing_queue-logs && chmod 777 ct-backing_queue-logs
+        mkdir ct-unit_plugin_versioning-logs-v3.7.28 && chmod 777 ct-unit_plugin_versioning-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=backing_queue \
+          --env CT_SUITE=unit_plugin_versioning \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-backing_queue-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.7.28
+        path: ct-unit_plugin_versioning-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_plugin_versioning [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_plugin_versioning-logs-v3.8.9 && chmod 777 ct-unit_plugin_versioning-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_plugin_versioning \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_plugin_versioning-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_plugin_versioning-logs-mixed-v3.8.9
+        path: ct-unit_plugin_versioning-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_policy_validators:
+    name: rabbit-ct-unit_policy_validators
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_policy_validators
+      run: |
+        mkdir ct-unit_policy_validators-logs && chmod 777 ct-unit_policy_validators-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_policy_validators-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-backing_queue-logs
-        path: ct-backing_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-queue_master_location-plus-1-more:
-    name: rabbit-ct-queue_master_location-plus-1-more
+        name: rabbit-ct-unit_policy_validators-logs
+        path: ct-unit_policy_validators-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_policy_validators [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_policy_validators-logs-v3.7.28 && chmod 777 ct-unit_policy_validators-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_policy_validators-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_policy_validators-logs-mixed-v3.7.28
+        path: ct-unit_policy_validators-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_policy_validators [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_policy_validators-logs-v3.8.9 && chmod 777 ct-unit_policy_validators-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_policy_validators \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_policy_validators-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_policy_validators-logs-mixed-v3.8.9
+        path: ct-unit_policy_validators-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_priority_queue:
+    name: rabbit-ct-unit_priority_queue
     needs:
     - prepare
     - rabbit-checks
@@ -2388,42 +6711,129 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-queue_master_location
+    - name: RUN ct-unit_priority_queue
       run: |
-        mkdir ct-queue_master_location-logs && chmod 777 ct-queue_master_location-logs
+        mkdir ct-unit_priority_queue-logs && chmod 777 ct-unit_priority_queue-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=queue_master_location \
+          --env CT_SUITE=unit_priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-queue_master_location-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_priority_queue-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-queue_master_location-logs
-        path: ct-queue_master_location-logs/*-ct-logs-*.tar.xz
-    - name: RUN ct-simple_ha
+        name: rabbit-ct-unit_priority_queue-logs
+        path: ct-unit_priority_queue-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_priority_queue [mixed v3.7.28]
       run: |
-        mkdir ct-simple_ha-logs && chmod 777 ct-simple_ha-logs
+        mkdir ct-unit_priority_queue-logs-v3.7.28 && chmod 777 ct-unit_priority_queue-logs-v3.7.28
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=simple_ha \
+          --env CT_SUITE=unit_priority_queue \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-simple_ha-logs:/workspace/ct-logs \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_priority_queue-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_priority_queue-logs-mixed-v3.7.28
+        path: ct-unit_priority_queue-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_priority_queue [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_priority_queue-logs-v3.8.9 && chmod 777 ct-unit_priority_queue-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_priority_queue \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_priority_queue-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_priority_queue-logs-mixed-v3.8.9
+        path: ct-unit_priority_queue-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_queue_consumers:
+    name: rabbit-ct-unit_queue_consumers
+    needs:
+    - prepare
+    - rabbit-checks
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+        service_account_key: ${{ secrets.GCR_JSON_KEY }}
+        export_default_credentials: true
+    - name: PULL IMAGE
+      run: |
+        gcloud auth configure-docker
+        docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
+    - name: RUN ct-unit_queue_consumers
+      run: |
+        mkdir ct-unit_queue_consumers-logs && chmod 777 ct-unit_queue_consumers-logs
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --volume ${PWD}/ct-unit_queue_consumers-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-simple_ha-logs
-        path: ct-simple_ha-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-eager_sync:
-    name: rabbit-ct-eager_sync
+        name: rabbit-ct-unit_queue_consumers-logs
+        path: ct-unit_queue_consumers-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_queue_consumers [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_queue_consumers-logs-v3.7.28 && chmod 777 ct-unit_queue_consumers-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_queue_consumers-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.7.28
+        path: ct-unit_queue_consumers-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_queue_consumers [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_queue_consumers-logs-v3.8.9 && chmod 777 ct-unit_queue_consumers-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_queue_consumers \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_queue_consumers-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_queue_consumers-logs-mixed-v3.8.9
+        path: ct-unit_queue_consumers-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_stats_and_metrics:
+    name: rabbit-ct-unit_stats_and_metrics
     needs:
     - prepare
     - rabbit-checks
@@ -2437,25 +6847,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-eager_sync
+    - name: RUN ct-unit_stats_and_metrics
       run: |
-        mkdir ct-eager_sync-logs && chmod 777 ct-eager_sync-logs
+        mkdir ct-unit_stats_and_metrics-logs && chmod 777 ct-unit_stats_and_metrics-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=eager_sync \
+          --env CT_SUITE=unit_stats_and_metrics \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-eager_sync-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-eager_sync-logs
-        path: ct-eager_sync-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-rabbit_stream_queue:
-    name: rabbit-ct-rabbit_stream_queue
+        name: rabbit-ct-unit_stats_and_metrics-logs
+        path: ct-unit_stats_and_metrics-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_stats_and_metrics [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_stats_and_metrics-logs-v3.7.28 && chmod 777 ct-unit_stats_and_metrics-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_stats_and_metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.7.28
+        path: ct-unit_stats_and_metrics-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_stats_and_metrics [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_stats_and_metrics-logs-v3.8.9 && chmod 777 ct-unit_stats_and_metrics-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_stats_and_metrics \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_stats_and_metrics-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_stats_and_metrics-logs-mixed-v3.8.9
+        path: ct-unit_stats_and_metrics-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_supervisor2:
+    name: rabbit-ct-unit_supervisor2
     needs:
     - prepare
     - rabbit-checks
@@ -2469,25 +6915,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-rabbit_stream_queue
+    - name: RUN ct-unit_supervisor2
       run: |
-        mkdir ct-rabbit_stream_queue-logs && chmod 777 ct-rabbit_stream_queue-logs
+        mkdir ct-unit_supervisor2-logs && chmod 777 ct-unit_supervisor2-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=rabbit_stream_queue \
+          --env CT_SUITE=unit_supervisor2 \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-rabbit_stream_queue-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_supervisor2-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-rabbit_stream_queue-logs
-        path: ct-rabbit_stream_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-quorum_queue:
-    name: rabbit-ct-quorum_queue
+        name: rabbit-ct-unit_supervisor2-logs
+        path: ct-unit_supervisor2-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_supervisor2 [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_supervisor2-logs-v3.7.28 && chmod 777 ct-unit_supervisor2-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_supervisor2 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_supervisor2-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_supervisor2-logs-mixed-v3.7.28
+        path: ct-unit_supervisor2-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_supervisor2 [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_supervisor2-logs-v3.8.9 && chmod 777 ct-unit_supervisor2-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_supervisor2 \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_supervisor2-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_supervisor2-logs-mixed-v3.8.9
+        path: ct-unit_supervisor2-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-unit_vm_memory_monitor:
+    name: rabbit-ct-unit_vm_memory_monitor
     needs:
     - prepare
     - rabbit-checks
@@ -2501,25 +6983,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-quorum_queue
+    - name: RUN ct-unit_vm_memory_monitor
       run: |
-        mkdir ct-quorum_queue-logs && chmod 777 ct-quorum_queue-logs
+        mkdir ct-unit_vm_memory_monitor-logs && chmod 777 ct-unit_vm_memory_monitor-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=quorum_queue \
+          --env CT_SUITE=unit_vm_memory_monitor \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-quorum_queue-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-quorum_queue-logs
-        path: ct-quorum_queue-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-clustering_management:
-    name: rabbit-ct-clustering_management
+        name: rabbit-ct-unit_vm_memory_monitor-logs
+        path: ct-unit_vm_memory_monitor-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_vm_memory_monitor [mixed v3.7.28]
+      run: |
+        mkdir ct-unit_vm_memory_monitor-logs-v3.7.28 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_vm_memory_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.7.28
+        path: ct-unit_vm_memory_monitor-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-unit_vm_memory_monitor [mixed v3.8.9]
+      run: |
+        mkdir ct-unit_vm_memory_monitor-logs-v3.8.9 && chmod 777 ct-unit_vm_memory_monitor-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=unit_vm_memory_monitor \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-unit_vm_memory_monitor-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-unit_vm_memory_monitor-logs-mixed-v3.8.9
+        path: ct-unit_vm_memory_monitor-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-upgrade_preparation:
+    name: rabbit-ct-upgrade_preparation
     needs:
     - prepare
     - rabbit-checks
@@ -2533,25 +7051,61 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-clustering_management
+    - name: RUN ct-upgrade_preparation
       run: |
-        mkdir ct-clustering_management-logs && chmod 777 ct-clustering_management-logs
+        mkdir ct-upgrade_preparation-logs && chmod 777 ct-upgrade_preparation-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=clustering_management \
+          --env CT_SUITE=upgrade_preparation \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-clustering_management-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-upgrade_preparation-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-clustering_management-logs
-        path: ct-clustering_management-logs/*-ct-logs-*.tar.xz
-  rabbit-ct-dynamic_ha:
-    name: rabbit-ct-dynamic_ha
+        name: rabbit-ct-upgrade_preparation-logs
+        path: ct-upgrade_preparation-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-upgrade_preparation [mixed v3.7.28]
+      run: |
+        mkdir ct-upgrade_preparation-logs-v3.7.28 && chmod 777 ct-upgrade_preparation-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=upgrade_preparation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-upgrade_preparation-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-upgrade_preparation-logs-mixed-v3.7.28
+        path: ct-upgrade_preparation-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-upgrade_preparation [mixed v3.8.9]
+      run: |
+        mkdir ct-upgrade_preparation-logs-v3.8.9 && chmod 777 ct-upgrade_preparation-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=upgrade_preparation \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-upgrade_preparation-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-upgrade_preparation-logs-mixed-v3.8.9
+        path: ct-upgrade_preparation-logs-v3.8.9/*-ct-logs-*.tar.xz
+  rabbit-ct-vhost:
+    name: rabbit-ct-vhost
     needs:
     - prepare
     - rabbit-checks
@@ -2565,44 +7119,158 @@ jobs:
       run: |
         gcloud auth configure-docker
         docker pull eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }}
-    - name: RUN ct-dynamic_ha
+    - name: RUN ct-vhost
       run: |
-        mkdir ct-dynamic_ha-logs && chmod 777 ct-dynamic_ha-logs
+        mkdir ct-vhost-logs && chmod 777 ct-vhost-logs
         docker run \
           --env project=rabbit \
-          --env CT_SUITE=dynamic_ha \
+          --env CT_SUITE=vhost \
           --env GITHUB_RUN_ID=${{ github.run_id }} \
           --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
-          --volume ${PWD}/ct-dynamic_ha-logs:/workspace/ct-logs \
+          --volume ${PWD}/ct-vhost-logs:/workspace/ct-logs \
           eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
           /workspace/rabbitmq/ci/scripts/ct-suite.sh
     - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT
       uses: actions/upload-artifact@v2-preview
       if: always()
       with:
-        name: rabbit-ct-dynamic_ha-logs
-        path: ct-dynamic_ha-logs/*-ct-logs-*.tar.xz
+        name: rabbit-ct-vhost-logs
+        path: ct-vhost-logs/*-ct-logs-*.tar.xz
+    - name: RUN ct-vhost [mixed v3.7.28]
+      run: |
+        mkdir ct-vhost-logs-v3.7.28 && chmod 777 ct-vhost-logs-v3.7.28
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=vhost \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.7.28 \
+          --volume ${PWD}/ct-vhost-logs-v3.7.28:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.7.28]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-vhost-logs-mixed-v3.7.28
+        path: ct-vhost-logs-v3.7.28/*-ct-logs-*.tar.xz
+    - name: RUN ct-vhost [mixed v3.8.9]
+      run: |
+        mkdir ct-vhost-logs-v3.8.9 && chmod 777 ct-vhost-logs-v3.8.9
+        docker run \
+          --env project=rabbit \
+          --env CT_SUITE=vhost \
+          --env GITHUB_RUN_ID=${{ github.run_id }} \
+          --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+          --env SECONDARY_UMBRELLA_VERSION=v3.8.9 \
+          --volume ${PWD}/ct-vhost-logs-v3.8.9:/workspace/ct-logs \
+          eu.gcr.io/cf-rabbitmq-core/ci-rabbit:erlang-23.1-rabbitmq-${{ github.sha }} \
+          /workspace/rabbitmq/ci/scripts/ct-suite.sh
+    - name: ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed v3.8.9]
+      uses: actions/upload-artifact@v2-preview
+      if: always()
+      with:
+        name: rabbit-ct-vhost-logs-mixed-v3.8.9
+        path: ct-vhost-logs-v3.8.9/*-ct-logs-*.tar.xz
   rabbit:
     name: rabbit
     needs:
     - rabbit-checks
-    - rabbit-ct-rabbit_confirms-plus-16-more
-    - rabbit-ct-unit_pg_local-plus-11-more
-    - rabbit-ct-message_size_limit-plus-10-more
-    - rabbit-ct-definition_import-plus-9-more
-    - rabbit-ct-unit_stats_and_metrics-plus-8-more
-    - rabbit-ct-feature_flags-plus-7-more
-    - rabbit-ct-crashing_queues-plus-5-more
-    - rabbit-ct-per_vhost_queue_limit-plus-4-more
-    - rabbit-ct-dead_lettering-plus-3-more
-    - rabbit-ct-dynamic_qq-plus-2-more
-    - rabbit-ct-queue_parallel-plus-2-more
-    - rabbit-ct-queue_master_location-plus-1-more
-    - rabbit-ct-eager_sync
-    - rabbit-ct-rabbit_stream_queue
-    - rabbit-ct-quorum_queue
+    - rabbit-ct-amqqueue_backward_compatibility
+    - rabbit-ct-backing_queue
+    - rabbit-ct-channel_interceptor
+    - rabbit-ct-channel_operation_timeout
+    - rabbit-ct-cluster
+    - rabbit-ct-cluster_rename
     - rabbit-ct-clustering_management
+    - rabbit-ct-config_schema
+    - rabbit-ct-confirms_rejects
+    - rabbit-ct-consumer_timeout
+    - rabbit-ct-crashing_queues
+    - rabbit-ct-dead_lettering
+    - rabbit-ct-definition_import
+    - rabbit-ct-disconnect_detected_during_alarm
     - rabbit-ct-dynamic_ha
+    - rabbit-ct-dynamic_qq
+    - rabbit-ct-eager_sync
+    - rabbit-ct-feature_flags
+    - rabbit-ct-lazy_queue
+    - rabbit-ct-list_consumers_sanity_check
+    - rabbit-ct-list_queues_online_and_offline
+    - rabbit-ct-maintenance_mode
+    - rabbit-ct-many_node_ha
+    - rabbit-ct-message_size_limit
+    - rabbit-ct-metrics
+    - rabbit-ct-mirrored_supervisor
+    - rabbit-ct-msg_store
+    - rabbit-ct-peer_discovery_classic_config
+    - rabbit-ct-peer_discovery_dns
+    - rabbit-ct-per_user_connection_channel_limit
+    - rabbit-ct-per_user_connection_channel_limit_partitions
+    - rabbit-ct-per_user_connection_channel_tracking
+    - rabbit-ct-per_user_connection_tracking
+    - rabbit-ct-per_vhost_connection_limit
+    - rabbit-ct-per_vhost_connection_limit_partitions
+    - rabbit-ct-per_vhost_msg_store
+    - rabbit-ct-per_vhost_queue_limit
+    - rabbit-ct-policy
+    - rabbit-ct-priority_queue
+    - rabbit-ct-priority_queue_recovery
+    - rabbit-ct-product_info
+    - rabbit-ct-proxy_protocol
+    - rabbit-ct-publisher_confirms_parallel
+    - rabbit-ct-queue_length_limits
+    - rabbit-ct-queue_master_location
+    - rabbit-ct-queue_parallel
+    - rabbit-ct-queue_type
+    - rabbit-ct-quorum_queue
+    - rabbit-ct-rabbit_confirms
+    - rabbit-ct-rabbit_core_metrics_gc
+    - rabbit-ct-rabbit_fifo
+    - rabbit-ct-rabbit_fifo_int
+    - rabbit-ct-rabbit_fifo_prop
+    - rabbit-ct-rabbit_fifo_v0
+    - rabbit-ct-rabbit_msg_record
+    - rabbit-ct-rabbit_stream_queue
+    - rabbit-ct-rabbitmq_queues_cli_integration
+    - rabbit-ct-rabbitmqctl_integration
+    - rabbit-ct-rabbitmqctl_shutdown
+    - rabbit-ct-signal_handling
+    - rabbit-ct-simple_ha
+    - rabbit-ct-single_active_consumer
+    - rabbit-ct-sync_detection
+    - rabbit-ct-term_to_binary_compat_prop
+    - rabbit-ct-topic_permission
+    - rabbit-ct-unit_access_control
+    - rabbit-ct-unit_access_control_authn_authz_context_propagation
+    - rabbit-ct-unit_access_control_credential_validation
+    - rabbit-ct-unit_amqp091_content_framing
+    - rabbit-ct-unit_amqp091_server_properties
+    - rabbit-ct-unit_app_management
+    - rabbit-ct-unit_cluster_formation_locking_mocks
+    - rabbit-ct-unit_collections
+    - rabbit-ct-unit_config_value_encryption
+    - rabbit-ct-unit_connection_tracking
+    - rabbit-ct-unit_credit_flow
+    - rabbit-ct-unit_disk_monitor
+    - rabbit-ct-unit_disk_monitor_mocks
+    - rabbit-ct-unit_file_handle_cache
+    - rabbit-ct-unit_gen_server2
+    - rabbit-ct-unit_gm
+    - rabbit-ct-unit_log_config
+    - rabbit-ct-unit_log_management
+    - rabbit-ct-unit_operator_policy
+    - rabbit-ct-unit_pg_local
+    - rabbit-ct-unit_plugin_directories
+    - rabbit-ct-unit_plugin_versioning
+    - rabbit-ct-unit_policy_validators
+    - rabbit-ct-unit_priority_queue
+    - rabbit-ct-unit_queue_consumers
+    - rabbit-ct-unit_stats_and_metrics
+    - rabbit-ct-unit_supervisor2
+    - rabbit-ct-unit_vm_memory_monitor
+    - rabbit-ct-upgrade_preparation
+    - rabbit-ct-vhost
     runs-on: ubuntu-18.04
     if: always()
     steps:
diff --git a/ci/dockerfiles/22.3/base b/ci/dockerfiles/22.3/erlang_elixir
index 38114e0eef..524d9af685 100644
--- a/ci/dockerfiles/22.3/base
+++ b/ci/dockerfiles/22.3/erlang_elixir
@@ -16,9 +16,3 @@ RUN set -xe \
 	&& rm elixir-src.tar.gz \
 	&& cd /usr/local/src/elixir \
 	&& make install clean
-
-RUN apt-get update && apt-get install -y rsync
-
-RUN curl -L -o buildevents https://github.com/honeycombio/buildevents/releases/latest/download/buildevents-linux-amd64
-RUN chmod 755 buildevents
-RUN mv buildevents /usr/bin/
diff --git a/ci/dockerfiles/23.1/base b/ci/dockerfiles/23.1/erlang_elixir
index 46ec420358..8fbefe953b 100644
--- a/ci/dockerfiles/23.1/base
+++ b/ci/dockerfiles/23.1/erlang_elixir
@@ -16,9 +16,3 @@ RUN set -xe \
 	&& rm elixir-src.tar.gz \
 	&& cd /usr/local/src/elixir \
 	&& make install clean
-
-RUN apt-get update && apt-get install -y rsync
-
-RUN curl -L -o buildevents https://github.com/honeycombio/buildevents/releases/latest/download/buildevents-linux-amd64
-RUN chmod 755 buildevents
-RUN mv buildevents /usr/bin/
diff --git a/ci/dockerfiles/ci-base b/ci/dockerfiles/ci-base
new file mode 100644
index 0000000000..0eb4624030
--- /dev/null
+++ b/ci/dockerfiles/ci-base
@@ -0,0 +1,20 @@
+ARG ERLANG_VERSION
+
+FROM eu.gcr.io/cf-rabbitmq-core/erlang_elixir:${ERLANG_VERSION}
+
+RUN apt-get update && apt-get install -y rsync zip
+
+RUN curl -L -o buildevents https://github.com/honeycombio/buildevents/releases/latest/download/buildevents-linux-amd64
+RUN chmod 755 buildevents
+RUN mv buildevents /usr/bin/
+
+WORKDIR /workspace
+
+COPY ci/scripts/fetch_secondary_umbrellas.sh .
+
+# If we clone the monorepo at a ref when the monorepo was still rabbitmq-server,
+# then we just get rabbitmq-server (not the monorepo as it would have looked, had
+# it existed at that time). So for the time being, secondary umbrellas will derive
+# from rabbitmq-public-umbrella (as they always have)
+ARG SECONDARY_UMBRELLA_GITREFS
+RUN bash fetch_secondary_umbrellas.sh ${SECONDARY_UMBRELLA_GITREFS}
\ No newline at end of file
diff --git a/ci/scripts/ct-suite.sh b/ci/scripts/ct-suite.sh
index 3d21eeb51d..a8e47c995c 100755
--- a/ci/scripts/ct-suite.sh
+++ b/ci/scripts/ct-suite.sh
@@ -14,8 +14,15 @@ catch() {
     fi
 }
 
-buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} ct-${CT_SUITE} -- \
+CMD=ct-${CT_SUITE}
+SECONDARY_UMBRELLA_ARGS=""
+if [[ "${SECONDARY_UMBRELLA_VERSION:-}" != "" ]]; then
+    CMD=ct-${CT_SUITE}-mixed-${SECONDARY_UMBRELLA_VERSION}
+    SECONDARY_UMBRELLA_ARGS="SECONDARY_UMBRELLA=/workspace/rabbitmq-${SECONDARY_UMBRELLA_VERSION} RABBITMQ_FEATURE_FLAGS="
+fi
+
+buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} ${CMD} -- \
             make ct-${CT_SUITE} \
                  FULL= \
                  FAIL_FAST=1 \
-                 SKIP_AS_ERROR=1
+                 SKIP_AS_ERROR=1 ${SECONDARY_UMBRELLA_ARGS}
diff --git a/ci/scripts/fetch_secondary_umbrellas.sh b/ci/scripts/fetch_secondary_umbrellas.sh
new file mode 100755
index 0000000000..466ef4a765
--- /dev/null
+++ b/ci/scripts/fetch_secondary_umbrellas.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -euo pipefail
+
+refs="$@"
+
+for version in ${refs}; do
+  umbrella="umbrellas/$version"
+  if ! test -d "$umbrella"  ||
+     ! make -C "$umbrella/deps/rabbit" test-dist; then
+    rm -rf "$umbrella"
+
+    # Fetch the master Umbrella; the final umbrellas are created from
+    # the master copy.
+    if ! test -d umbrellas/master; then
+      git config --global advice.detachedHead false
+      git clone \
+        https://github.com/rabbitmq/rabbitmq-public-umbrella.git \
+        umbrellas/master
+      make -C umbrellas/master co # To get RabbitMQ components.
+    fi
+
+    # We copy the master Umbrella and checkout the appropriate tag.
+    cp -a umbrellas/master "$umbrella"
+    git -C "$umbrella" checkout "master"
+    make -C "$umbrella" up BRANCH="$version"
+    # To remove third-party deps which were checked out when the
+    # projects were on the `master` branch. Thus, possibly not the
+    # version pinning we expect. We update the Umbrella one last time
+    # to fetch the correct third-party deps.
+    make -C "$umbrella" clean-3rd-party-repos
+    make -C "$umbrella" up
+    make -C "$umbrella/deps/rabbit" test-dist
+    rm -rf "$umbrella"/deps/rabbitmq_website
+    rm -rf "$umbrella"/deps/rabbitmq_prometheus/docker
+    rm -rf "$umbrella"/deps/*/{.git,test} "$umbrella"/.git
+  fi
+done
+
+for version in ${refs}; do
+  umbrella="umbrellas/$version"
+  mv ${umbrella} rabbitmq-${version}
+done
+
+rm -fr umbrellas
diff --git a/mk/github-actions.mk b/mk/github-actions.mk
index 2bd4ce4afa..520787b980 100644
--- a/mk/github-actions.mk
+++ b/mk/github-actions.mk
@@ -155,14 +155,3 @@ docker: local-ci-image
 		--oom-score-adj -500 \
 		$(LOCAL_IMAGE) \
 		/bin/bash
-
-# A literal space.
-space :=
-space +=
-
-comma := ,
-
-# Joins elements of the list in arg 2 with the given separator.
-#   1. Element separator.
-#   2. The list.
-join-with = $(subst $(space),$1,$(strip $(comma)))
\ No newline at end of file
diff --git a/workflow_sources/base_image/workflow.yml b/workflow_sources/base_image/workflow.yml
index b0c7b7d4d2..e1b32c708b 100644
--- a/workflow_sources/base_image/workflow.yml
+++ b/workflow_sources/base_image/workflow.yml
@@ -9,24 +9,41 @@
 #@   return jobs
 #@ end
 
+#@ def to_build_args(d):
+#@   return ",".join(['{0}={1}'.format(k,d[k]) for k in d.keys()])
+#@ end
+
 #@ def base_image_job(erlang_version):
 name: #@ ("ci-base-" + erlang_version).replace(".", "_")
 runs-on: ubuntu-18.04
 steps:
   - name: CHECKOUT REPOSITORY
     uses: actions/checkout@v2
-  - name: CREATE BASE CI IMAGE
+  - name: #@ 'CREATE ERLANG+ELIXIR IMAGE ({})'.format(erlang_version)
+    uses: docker/build-push-action@v1
+    with:
+      username: _json_key
+      password: ${{ secrets.GCR_JSON_KEY }}
+      registry: eu.gcr.io
+      repository: cf-rabbitmq-core/erlang_elixir
+      dockerfile: #@ 'ci/dockerfiles/{}/erlang_elixir'.format(erlang_version)
+      tags: #@ erlang_version
+  - name: #@ 'CREATE BASE CI IMAGE ({})'.format(erlang_version)
     uses: docker/build-push-action@v1
     with:
       username: _json_key
       password: ${{ secrets.GCR_JSON_KEY }}
       registry: eu.gcr.io
       repository: cf-rabbitmq-core/ci-base
-      dockerfile: #@ "ci/dockerfiles/" + erlang_version + "/base"
+      dockerfile: ci/dockerfiles/ci-base
+      #@ build_args = {}
+      #@ build_args["ERLANG_VERSION"] = erlang_version
+      #@ build_args["SECONDARY_UMBRELLA_GITREFS"] = ' '.join(data.values.secondary_umbrella_gitrefs)
+      build_args: #@ to_build_args(build_args)
       tags: #@ erlang_version
 #@ end
 ---
-name: Base Images
+name: Workflow Base Images
 #! https://github.com/k14s/ytt/issues/189
 a_magic_string_that_we_will_sed_to_on: [workflow_dispatch]
 jobs: #@ jobs_map_from_list([base_image_job(v) for v in data.values.erlang_versions])
diff --git a/workflow_sources/base_values.yml b/workflow_sources/base_values.yml
index 6c3d37523b..e40c75bb16 100644
--- a/workflow_sources/base_values.yml
+++ b/workflow_sources/base_values.yml
@@ -1,6 +1,9 @@
 #@data/values
 ---
 base_rmq_ref: master
+secondary_umbrella_gitrefs:
+- v3.7.28
+- v3.8.9
 #! these values are injected at template time from the cli,
 #! but must be declared first here
 erlang_versions: []
diff --git a/workflow_sources/test/ct.lib.yml b/workflow_sources/test/ct.lib.yml
index 08cdd31d04..2d316a94f0 100644
--- a/workflow_sources/test/ct.lib.yml
+++ b/workflow_sources/test/ct.lib.yml
@@ -1,6 +1,6 @@
 #@ load("@ytt:data", "data")
 #@ load("@ytt:assert", "assert")
-#@ load("util.star", "is_unique", "group_by_time", "to_build_args")
+#@ load("util.star", "is_unique", "group_by_one", "to_build_args")
 #@ load("helpers.star", "ci_image_tag", "ci_dep_image")
 
 #@ def checks_job(dep):
@@ -77,12 +77,36 @@ steps:
     with:
       name: (@= dep.name @)-ct-(@= suite @)-logs
       path: "ct-(@= suite @)-logs/*-ct-logs-*.tar.xz"
+  #@ for version in data.values.secondary_umbrella_gitrefs:
+  #@   logs_dir = 'ct-{}-logs-{}'.format(suite, version)
+  - name: #@ "RUN ct-{} [mixed {}]".format(suite, version)
+    run: |
+      mkdir (@= logs_dir @) && chmod 777 (@= logs_dir @)
+      docker run \
+        --env project=(@= dep.name @) \
+        --env CT_SUITE=(@= suite @) \
+        --env GITHUB_RUN_ID=${{ github.run_id }} \
+        --env BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }} \
+        --env SECONDARY_UMBRELLA_VERSION=(@= version @) \
+        --volume ${PWD}/(@= logs_dir @):/workspace/ct-logs \
+        (@= ci_dep_image(dep.name) @) \
+        /workspace/rabbitmq/ci/scripts/ct-suite.sh
+  - name: #@ 'ON FAILURE UPLOAD TESTS LOGS ARTIFACT [mixed {}]'.format(version)
+    #! https://github.com/marketplace/actions/upload-artifact
+    uses: actions/upload-artifact@v2-preview
+    #! For whatever reason, "if: steps.(@= suite @).outcome == 'failure'" never executes,
+    #! so just run always
+    if: always()
+    with:
+      name: (@= dep.name @)-ct-(@= suite @)-logs-mixed-(@= version @)
+      path: "(@= logs_dir @)/*-ct-logs-*.tar.xz"
+  #@ end
   #@ end
 #@ end
 
 #@ def collect_job(dep):
 name: #@ dep.name
-needs: #@ [dep.name + "-checks"] + [dep.name + "-ct-" + group["name"] for group in group_by_time(dep.suites)]
+needs: #@ [dep.name + "-checks"] + [dep.name + "-ct-" + group["name"] for group in group_by_one(dep.suites)]
 runs-on: ubuntu-18.04
 if: always()
 #@yaml/text-templated-strings
diff --git a/workflow_sources/test/dep.star b/workflow_sources/test/dep.star
index fc526f268c..a74b0bef99 100644
--- a/workflow_sources/test/dep.star
+++ b/workflow_sources/test/dep.star
@@ -1,4 +1,4 @@
-load("util.star", "group_by_time")
+load("util.star", "group_by_one")
 load("rabbitmq_cli.lib.yml", "rabbitmq_cli_job")
 load("ct.lib.yml", "checks_job", "ct_suites_job", "collect_job")
 load("tests.lib.yml", "tests_job")
@@ -10,7 +10,7 @@ def dep_jobs(dep):
       jobs[dep.name] = rabbitmq_cli_job(dep)
     elif len(dep.suites) > 20:
       jobs[dep.name + "-checks"] = checks_job(dep)
-      for group in group_by_time(dep.suites):
+      for group in group_by_one(dep.suites):
         jobs[dep.name + "-ct-" + group["name"]] = ct_suites_job(dep, group)
       end
       jobs[dep.name] = collect_job(dep)
diff --git a/workflow_sources/test/util.star b/workflow_sources/test/util.star
index da742d54a2..2c6d348564 100644
--- a/workflow_sources/test/util.star
+++ b/workflow_sources/test/util.star
@@ -48,6 +48,11 @@ def group_by_time(suites):
   return [{"name": name(suites), "suites": [suite.name for suite in suites]} for suites in groups]
 end
 
+# Used when we don't actually want multiple ct-suites per job
+def group_by_one(suites):
+  return [{"name": suite.name, "suites": [suite.name]} for suite in suites]
+end
+
 def to_build_args(d):
   return ",".join(['{0}={1}'.format(k,d[k]) for k in d.keys()])
 end