diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 500bb656d9d1..575a6a0f9a31 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -54,4 +54,6 @@ jobs:
       - name: Run mypy checks
         run: tox -e mypy
       - uses: psf/black@stable
+        with:
+          version: "23.3.0"
       - uses: isort/isort-action@master
diff --git a/client/src/components/Panels/Common/ToolPanelLabel.vue b/client/src/components/Panels/Common/ToolPanelLabel.vue
index 36dc2f47b571..791925ac8d75 100644
--- a/client/src/components/Panels/Common/ToolPanelLabel.vue
+++ b/client/src/components/Panels/Common/ToolPanelLabel.vue
@@ -1,12 +1,7 @@
 <template>
-    <div
-        v-b-tooltip.topright.hover
-        class="tool-panel-label"
-        :title="description"
-        @mouseover="hover = true"
-        @mouseleave="hover = false">
+    <div v-b-tooltip.topright.hover class="tool-panel-label" tabindex="0" :title="description">
         {{ definition.text }}
-        <ToolPanelLinks :show="hover" :links="definition.links" />
+        <ToolPanelLinks :links="definition.links" />
     </div>
 </template>
 
@@ -21,11 +16,6 @@ export default {
             required: true,
         },
     },
-    data() {
-        return {
-            hover: false,
-        };
-    },
     computed: {
         description() {
             return this.definition.description;
@@ -33,3 +23,19 @@ export default {
     },
 };
 </script>
+
+<style scoped lang="scss">
+.tool-panel-label {
+    &:deep(.tool-panel-links) {
+        display: none;
+    }
+
+    &:hover,
+    &:focus,
+    &:focus-within {
+        &:deep(.tool-panel-links) {
+            display: inline;
+        }
+    }
+}
+</style>
diff --git a/client/src/components/Panels/Common/ToolPanelLinks.vue b/client/src/components/Panels/Common/ToolPanelLinks.vue
index 7f394352d752..1c05744b8fd4 100644
--- a/client/src/components/Panels/Common/ToolPanelLinks.vue
+++ b/client/src/components/Panels/Common/ToolPanelLinks.vue
@@ -1,7 +1,8 @@
 <template>
-    <span v-if="link">
+    <span v-if="link" class="tool-panel-links">
         <a :href="link" target="_blank" style="display: inline">
-            <font-awesome-icon v-show="show" v-b-tooltip.hover title="Link" icon="external-link-alt" />
+            <font-awesome-icon v-b-tooltip.hover title="Link" icon="external-link-alt" />
+            <span class="sr-only">Link</span>
         </a>
     </span>
 </template>
@@ -18,9 +19,7 @@ export default {
     props: {
         links: {
             type: Object,
-        },
-        show: {
-            type: Boolean,
+            default: () => ({}),
         },
     },
     computed: {
diff --git a/client/src/components/Panels/Common/ToolSection.vue b/client/src/components/Panels/Common/ToolSection.vue
index f11b29e44065..ddb630f6d087 100644
--- a/client/src/components/Panels/Common/ToolSection.vue
+++ b/client/src/components/Panels/Common/ToolSection.vue
@@ -3,22 +3,21 @@
         <div
             v-b-tooltip.topright.hover
             :class="['toolSectionTitle', `tool-menu-section-${sectionName}`]"
-            :title="title"
-            @mouseover="hover = true"
-            @mouseleave="hover = false"
-            @focus="hover = true"
-            @blur="hover = false">
+            :title="title">
             <a class="title-link" href="javascript:void(0)" @click="toggleMenu()">
                 <span class="name">
                     {{ name }}
                 </span>
-                <ToolPanelLinks :links="links" :show="hover" />
+                <ToolPanelLinks :links="links" />
             </a>
         </div>
         <transition name="slide">
             <div v-if="opened">
                 <template v-for="[key, el] in sortedElements">
-                    <ToolPanelLabel v-if="category.text" :key="key" :definition="el" />
+                    <ToolPanelLabel
+                        v-if="category.text || el.model_class === 'ToolSectionLabel'"
+                        :key="key"
+                        :definition="el" />
                     <tool
                         v-else
                         :key="key"
@@ -253,4 +252,18 @@ export default {
     overflow: hidden;
     max-height: 0;
 }
+
+.title-link {
+    &:deep(.tool-panel-links) {
+        display: none;
+    }
+
+    &:hover,
+    &:focus,
+    &:focus-within {
+        &:deep(.tool-panel-links) {
+            display: inline;
+        }
+    }
+}
 </style>
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 11efd62007d8..f906d8575bc3 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -639,27 +639,25 @@ export default {
                 this.isCanvas = true;
                 return;
             }
-            const stepData = {
-                name: name,
-                content_id: contentId,
-                input_connections: {},
-                type: type,
-                outputs: [],
-                position: defaultPosition(this.graphOffset, this.transform),
-                post_job_actions: {},
-            };
-            const { id } = this.stepStore.addStep(stepData);
-            getModule(stepData, id, this.stateStore.setLoadingState).then((response) => {
-                this.stepStore.updateStep({
-                    ...stepData,
-                    id: id,
-                    tool_state: response.tool_state,
-                    inputs: response.inputs,
-                    outputs: response.outputs,
-                    config_form: response.config_form,
-                });
-                this.stateStore.setActiveNode(id);
-            });
+            const stepData = this.stepStore.insertNewStep(
+                contentId,
+                name,
+                type,
+                defaultPosition(this.graphOffset, this.transform)
+            );
+
+            getModule({ name, type, content_id: contentId }, stepData.id, this.stateStore.setLoadingState).then(
+                (response) => {
+                    this.stepStore.updateStep({
+                        ...stepData,
+                        tool_state: response.tool_state,
+                        inputs: response.inputs,
+                        outputs: response.outputs,
+                        config_form: response.config_form,
+                    });
+                    this.stateStore.setActiveNode(stepData.id);
+                }
+            );
         },
         async _loadEditorData(data) {
             if (data.name !== undefined) {
diff --git a/client/src/components/Workflow/Editor/composables/useStepProps.ts b/client/src/components/Workflow/Editor/composables/useStepProps.ts
index 8347efd2467e..4c4ddb2aff5e 100644
--- a/client/src/components/Workflow/Editor/composables/useStepProps.ts
+++ b/client/src/components/Workflow/Editor/composables/useStepProps.ts
@@ -11,12 +11,12 @@ export function useStepProps(step: Ref<Step>) {
         type,
         inputs: stepInputs,
         outputs: stepOutputs,
-        config_form: configForm,
         post_job_actions: postJobActions,
     } = toRefs(step);
 
     const label = computed(() => step.value.label ?? undefined);
     const annotation = computed(() => step.value.annotation ?? null);
+    const configForm = computed(() => step.value.config_form);
 
     return {
         stepId,
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
index 4633e5170e88..6366c156884f 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
@@ -1,10 +1,9 @@
-<script setup>
-import GenericHistoryItem from "components/History/Content/GenericItem";
-
+<script setup lang="ts">
 import { useWorkflowInstance } from "@/composables/useWorkflowInstance";
 
-import ParameterStep from "./ParameterStep";
-import WorkflowInvocationStep from "./WorkflowInvocationStep";
+import ParameterStep from "./ParameterStep.vue";
+import WorkflowInvocationStep from "./WorkflowInvocationStep.vue";
+import GenericHistoryItem from "components/History/Content/GenericItem.vue";
 
 const props = defineProps({
     invocation: {
@@ -13,9 +12,13 @@ const props = defineProps({
     },
 });
 
+interface HasSrc {
+    src: string;
+}
+
 const { workflow } = useWorkflowInstance(props.invocation.workflow_id);
 
-function dataInputStepLabel(key, input) {
+function dataInputStepLabel(key: number, input: HasSrc) {
     const invocationStep = props.invocation.steps[key];
     let label = invocationStep && invocationStep.workflow_step_label;
     if (!label) {
diff --git a/client/src/composables/useWorkflowInstance.ts b/client/src/composables/useWorkflowInstance.ts
index 80c616e0cec6..426c9269bfbc 100644
--- a/client/src/composables/useWorkflowInstance.ts
+++ b/client/src/composables/useWorkflowInstance.ts
@@ -1,10 +1,10 @@
-import { ref } from "vue";
+import { computed, ref } from "vue";
 
 import { useWorkflowStore } from "@/stores/workflowStore";
 
 export function useWorkflowInstance(workflowId: string) {
     const workflowStore = useWorkflowStore();
-    const workflow = ref(workflowStore.getStoredWorkflowByInstanceId(workflowId));
+    const workflow = computed(() => workflowStore.getStoredWorkflowByInstanceId(workflowId));
     const loading = ref(false);
 
     async function getWorkflowInstance() {
@@ -13,8 +13,9 @@ export function useWorkflowInstance(workflowId: string) {
             try {
                 await workflowStore.fetchWorkflowForInstanceId(workflowId);
             } catch (e) {
-                loading.value = false;
                 console.error("unable to fetch workflow \n", e);
+            } finally {
+                loading.value = false;
             }
         }
     }
diff --git a/client/src/onload/console.js b/client/src/onload/console.js
new file mode 100644
index 000000000000..0d1fdd7e35a1
--- /dev/null
+++ b/client/src/onload/console.js
@@ -0,0 +1,56 @@
+/**
+ * This module disables the console in production,
+ * and adds the ability to toggle console logging
+ * using the global functions
+ * enableDebugging() and disableDebugging()
+ */
+import { useLocalStorage } from "@vueuse/core";
+import { watch } from "vue";
+
+export function overrideProductionConsole() {
+    let defaultEnabled = true;
+
+    if (process.env.NODE_ENV == "production") {
+        defaultEnabled = false;
+    }
+
+    const isEnabled = useLocalStorage("console-debugging-enabled", defaultEnabled);
+
+    let storedConsole = null;
+
+    const disableConsole = () => {
+        storedConsole = console;
+        // eslint-disable-next-line no-global-assign
+        console = {};
+        Object.keys(storedConsole).forEach((key) => {
+            console[key] = () => {};
+        });
+    };
+
+    const enableConsole = () => {
+        if (storedConsole) {
+            // eslint-disable-next-line no-global-assign
+            console = storedConsole;
+        }
+    };
+
+    watch(
+        () => isEnabled.value,
+        (enabled) => {
+            if (enabled) {
+                enableConsole();
+            } else {
+                disableConsole();
+            }
+        },
+        { immediate: true }
+    );
+
+    window.enableDebugging = () => {
+        isEnabled.value = true;
+    };
+
+    window.disableDebugging = () => {
+        isEnabled.value = false;
+    };
+}
diff --git a/client/src/onload/index.js b/client/src/onload/index.js
index cc2614a90982..110bdb6b3966 100644
--- a/client/src/onload/index.js
+++ b/client/src/onload/index.js
@@ -16,6 +16,10 @@ import config from "config";
 // Custom Icons
 import customIconPack from "@/assets/icons.json";
 
+import { overrideProductionConsole } from "./console";
+
+overrideProductionConsole();
+
 // Module exports appear as objects on window.config in the browser
 export { getRootFromIndexLink } from "./getRootFromIndexLink";
 export { addInitialization, clearInitQueue, initializations$, prependInitialization } from "./initQueue";
diff --git a/client/src/stores/workflowStepStore.ts b/client/src/stores/workflowStepStore.ts
index f626f3853c13..8457cf5c98b3 100644
--- a/client/src/stores/workflowStepStore.ts
+++ b/client/src/stores/workflowStepStore.ts
@@ -192,6 +192,25 @@ export const useWorkflowStepStore = defineStore("workflowStepStore", {
             this.stepExtraInputs[step.id] = getStepExtraInputs(step);
             return step;
         },
+        insertNewStep(
+            contentId: NewStep["content_id"],
+            name: NewStep["name"],
+            type: NewStep["type"],
+            position: NewStep["position"]
+        ) {
+            const stepData: NewStep = {
+                name: name,
+                content_id: contentId,
+                input_connections: {},
+                type: type,
+                inputs: [],
+                outputs: [],
+                position: position,
+                post_job_actions: {},
+                tool_state: {},
+            };
+            return this.addStep(stepData);
+        },
         updateStep(this: State, step: Step) {
             const workflow_outputs = step.workflow_outputs?.filter((workflowOutput) =>
                 step.outputs.find((output) => workflowOutput.output_name == output.name)
diff --git a/client/webpack.config.js b/client/webpack.config.js
index b749fbe4a7d2..e68cd301aadf 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -37,16 +37,7 @@ module.exports = (env = {}, argv = {}) => {
     if (targetEnv == "production") {
         minimizations = {
             minimize: true,
-            minimizer: [
-                new TerserPlugin({
-                    terserOptions: {
-                        compress: {
-                            drop_console: true,
-                        },
-                    },
-                }),
-                new CssMinimizerPlugin(),
-            ],
+            minimizer: [new TerserPlugin(), new CssMinimizerPlugin()],
         };
     } else {
         minimizations = {
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 20d9bef1df63..9b6962cec453 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -566,9 +566,7 @@ def stderr(self, stderr):
 LEFT OUTER JOIN library_dataset_dataset_association ON dataset.id = library_dataset_dataset_association.dataset_id
 WHERE dataset.id IN (SELECT dataset_id FROM per_hist_hdas)
     AND library_dataset_dataset_association.id IS NULL
-    AND (
-        {dataset_condition}
-    )
+    {and_dataset_condition}
 """
 
 
@@ -577,7 +575,7 @@ def calculate_user_disk_usage_statements(user_id, quota_source_map, for_sqlite=F
     statements = []
     default_quota_enabled = quota_source_map.default_quota_enabled
     default_exclude_ids = quota_source_map.default_usage_excluded_ids()
-    default_cond = "dataset.object_store_id IS NULL" if default_quota_enabled else ""
+    default_cond = "dataset.object_store_id IS NULL" if default_quota_enabled and default_exclude_ids else ""
     exclude_cond = "dataset.object_store_id NOT IN :exclude_object_store_ids" if default_exclude_ids else ""
     use_or = " OR " if (default_cond != "" and exclude_cond != "") else ""
     default_usage_dataset_condition = "{default_cond} {use_or} {exclude_cond}".format(
@@ -585,7 +583,9 @@ def calculate_user_disk_usage_statements(user_id, quota_source_map, for_sqlite=F
         exclude_cond=exclude_cond,
         use_or=use_or,
     )
-    default_usage = UNIQUE_DATASET_USER_USAGE.format(dataset_condition=default_usage_dataset_condition)
+    if default_usage_dataset_condition.strip():
+        default_usage_dataset_condition = f"AND ( {default_usage_dataset_condition} )"
+    default_usage = UNIQUE_DATASET_USER_USAGE.format(and_dataset_condition=default_usage_dataset_condition)
     default_usage = (
         """
 UPDATE galaxy_user SET disk_usage = (%s)
@@ -602,7 +602,7 @@ def calculate_user_disk_usage_statements(user_id, quota_source_map, for_sqlite=F
     # the object_store_id to quota_source_label into a temp table of values
     for quota_source_label, object_store_ids in source.items():
         label_usage = UNIQUE_DATASET_USER_USAGE.format(
-            dataset_condition="dataset.object_store_id IN :include_object_store_ids"
+            and_dataset_condition="AND ( dataset.object_store_id IN :include_object_store_ids )"
         )
         if for_sqlite:
             # hacky alternative for older sqlite
@@ -622,7 +622,7 @@ def calculate_user_disk_usage_statements(user_id, quota_source_map, for_sqlite=F
         else:
             statement = """
 INSERT INTO user_quota_source_usage(user_id, quota_source_label, disk_usage)
-VALUES(:user_id, :label, ({label_usage}))
+VALUES(:id, :label, ({label_usage}))
 ON CONFLICT
 ON constraint uqsu_unique_label_per_user
 DO UPDATE SET disk_usage = excluded.disk_usage
@@ -997,16 +997,25 @@ def calculate_disk_usage_default_source(self, object_store):
         assert object_store is not None
         quota_source_map = object_store.get_quota_source_map()
         default_quota_enabled = quota_source_map.default_quota_enabled
-        default_cond = "dataset.object_store_id IS NULL OR" if default_quota_enabled else ""
+        exclude_objectstore_ids = quota_source_map.default_usage_excluded_ids()
+        default_cond = "dataset.object_store_id IS NULL OR" if default_quota_enabled and exclude_objectstore_ids else ""
         default_usage_dataset_condition = (
-            "{default_cond} dataset.object_store_id NOT IN :exclude_object_store_ids".format(
-                default_cond=default_cond,
+            (
+                "AND ( {default_cond} dataset.object_store_id NOT IN :exclude_object_store_ids )".format(
+                    default_cond=default_cond,
+                )
             )
+            if exclude_objectstore_ids
+            else ""
         )
-        default_usage = UNIQUE_DATASET_USER_USAGE.format(dataset_condition=default_usage_dataset_condition)
+        default_usage = UNIQUE_DATASET_USER_USAGE.format(and_dataset_condition=default_usage_dataset_condition)
         sql_calc = text(default_usage)
-        sql_calc = sql_calc.bindparams(bindparam("id"), bindparam("exclude_object_store_ids", expanding=True))
-        params = {"id": self.id, "exclude_object_store_ids": quota_source_map.default_usage_excluded_ids()}
+        params = {"id": self.id}
+        bindparams = [bindparam("id")]
+        if exclude_objectstore_ids:
+            params["exclude_object_store_ids"] = exclude_objectstore_ids
+            bindparams.append(bindparam("exclude_object_store_ids", expanding=True))
+        sql_calc = sql_calc.bindparams(*bindparams)
         sa_session = object_session(self)
         usage = sa_session.scalar(sql_calc, params)
         return usage
@@ -7755,6 +7764,7 @@ def copy_to(self, copied_step, step_mapping, user=None):
         copied_step.position = self.position
         copied_step.config = self.config
         copied_step.label = self.label
+        copied_step.when_expression = self.when_expression
         copied_step.inputs = copy_list(self.inputs, copied_step)
 
         subworkflow_step_mapping = {}
diff --git a/lib/galaxy/tool_util/deps/container_classes.py b/lib/galaxy/tool_util/deps/container_classes.py
index 1d6460e6f8c5..56211180b847 100644
--- a/lib/galaxy/tool_util/deps/container_classes.py
+++ b/lib/galaxy/tool_util/deps/container_classes.py
@@ -572,6 +572,7 @@ def containerize_command(self, command: str) -> str:
             guest_ports=self.tool_info.guest_ports,
             container_name=self.container_name,
             cleanenv=asbool(self.prop("cleanenv", singularity_util.DEFAULT_CLEANENV)),
+            no_mount=self.prop("no_mount", singularity_util.DEFAULT_NO_MOUNT),
             **self.get_singularity_target_kwds(),
         )
         return run_command
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 8874639dd550..8c99c6cb983e 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -577,6 +577,7 @@ def build_module(self, trans: GalaxyWebTransaction, payload=None):
         POST /api/workflows/build_module
         Builds module models for the workflow editor.
         """
+        # payload is tool state
         if payload is None:
             payload = {}
         inputs = payload.get("inputs", {})
@@ -587,8 +588,6 @@ def build_module(self, trans: GalaxyWebTransaction, payload=None):
             populate_state(trans, module.get_inputs(), inputs, module_state, check=False)
             module.recover_state(module_state, from_tool_form=True)
         return {
-            "label": inputs.get("__label", ""),
-            "annotation": inputs.get("__annotation", ""),
             "name": module.get_name(),
             "tool_state": module.get_state(),
             "content_id": module.get_content_id(),
diff --git a/test/integration/test_recalculate_user_disk_usage.py b/test/integration/test_recalculate_user_disk_usage.py
index 28c14dd4be2c..b891e46fb7a0 100644
--- a/test/integration/test_recalculate_user_disk_usage.py
+++ b/test/integration/test_recalculate_user_disk_usage.py
@@ -1,19 +1,35 @@
+import string
+import time
+
 from galaxy_test.base.populators import DatasetPopulator
 from galaxy_test.driver.integration_util import IntegrationTestCase
+from .objectstore._base import BaseObjectStoreIntegrationTestCase
+from .objectstore.test_selection_with_resource_parameters import DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE
 
+SIMPLE_DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template(
+    """<?xml version="1.0"?>
+<object_store type="distributed" id="primary" order="0">
+    <backends>
+        <backend id="default" type="disk" weight="1" name="Default Store">
+            <description>This is my description of the default store with *markdown*.</description>
+            <files_dir path="${temp_directory}/files_default"/>
+            <extra_dir type="temp" path="${temp_directory}/tmp_default"/>
+            <extra_dir type="job_work" path="${temp_directory}/job_working_directory_default"/>
+        </backend>
+        <backend id="static" type="disk" weight="0">
+            <files_dir path="${temp_directory}/files_static"/>
+            <extra_dir type="temp" path="${temp_directory}/tmp_static"/>
+            <extra_dir type="job_work" path="${temp_directory}/job_working_directory_static"/>
+        </backend>
+    </backends>
+</object_store>
+"""
+)
 
-class TestRecalculateUserDiskUsageIntegration(IntegrationTestCase):
-    task_based = True
-    dataset_populator: DatasetPopulator
 
-    def setUp(self):
-        super().setUp()
-        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
-
-    @classmethod
-    def handle_galaxy_config_kwds(cls, config):
-        super().handle_galaxy_config_kwds(config)
-        config["allow_user_dataset_purge"] = True
+class RecalculateDiskUsage:
+    task_based: bool
+    dataset_populator: DatasetPopulator
 
     def test_recalculate_user_disk_usage(self):
         # The initial disk usage is 0
@@ -26,6 +42,12 @@ def test_recalculate_user_disk_usage(self):
         # The usage should be the total of the datasets
         current_usage = self.dataset_populator.get_usage_for(None)
         assert current_usage["total_disk_usage"] == expected_usage
+
+        self.recalculate_disk_usage()
+        # The disk usage should still be the expected usage
+        current_usage = self.dataset_populator.get_usage_for(None)
+        assert current_usage["total_disk_usage"] == expected_usage
+
         self.dataset_populator.delete_dataset(history_id, hda_id, purge=True, wait_for_purge=True)
 
         # Purging that dataset should result in usage dropping back
@@ -33,10 +55,80 @@ def test_recalculate_user_disk_usage(self):
         current_usage = self.dataset_populator.get_usage_for(None)
         assert current_usage["total_disk_usage"] == 0
 
-        recalculate_response = self._put("users/current/recalculate_disk_usage")
-        task_ok = self.dataset_populator.wait_on_task(recalculate_response)
-        assert task_ok
-
+        self.recalculate_disk_usage()
         # The disk usage should be 0 again
         current_usage = self.dataset_populator.get_usage_for(None)
         assert current_usage["total_disk_usage"] == 0
+
+    def recalculate_disk_usage(self):
+        recalculate_response = self.dataset_populator._put("users/current/recalculate_disk_usage")
+        if self.task_based:
+            task_ok = self.dataset_populator.wait_on_task(recalculate_response)
+            assert task_ok
+        else:
+            time.sleep(2)
+
+
+class TestRecalculateUserDiskUsageIntegration(IntegrationTestCase, RecalculateDiskUsage):
+    task_based = True
+    dataset_populator: DatasetPopulator
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        super().handle_galaxy_config_kwds(config)
+        config["allow_user_dataset_purge"] = True
+
+
+class TestRecalculateUserDiskUsageHierarchicalIntegration(BaseObjectStoreIntegrationTestCase, RecalculateDiskUsage):
+    task_based = True
+    dataset_populator: DatasetPopulator
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        cls._configure_object_store(DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE, config)
+        super().handle_galaxy_config_kwds(config)
+        config["allow_user_dataset_purge"] = True
+
+
+class TestRecalculateUserDiskUsageSimpleHierarchicalIntegration(
+    BaseObjectStoreIntegrationTestCase, RecalculateDiskUsage
+):
+    task_based = True
+    dataset_populator: DatasetPopulator
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        cls._configure_object_store(SIMPLE_DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE, config)
+        super().handle_galaxy_config_kwds(config)
+        config["allow_user_dataset_purge"] = True
+
+
+class TestRecalculateUserDiskUsageHierarchicalNoTaskIntegration(
+    BaseObjectStoreIntegrationTestCase, RecalculateDiskUsage
+):
+    task_based = False
+    dataset_populator: DatasetPopulator
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        cls._configure_object_store(DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE, config)
+        super().handle_galaxy_config_kwds(config)
+        config["allow_user_dataset_purge"] = True
+        config["enable_celery_tasks"] = False
+        config["metadata_strategy"] = "extended"
diff --git a/test/integration_selenium/test_edam_tool_panel_views.py b/test/integration_selenium/test_edam_tool_panel_views.py
index 50e1b8447314..a98b608d2e6a 100644
--- a/test/integration_selenium/test_edam_tool_panel_views.py
+++ b/test/integration_selenium/test_edam_tool_panel_views.py
@@ -38,4 +38,4 @@ def _assert_displaying_edam_operations(self):
         labels = tool_panel.panel_labels.all()
         assert len(labels) > 0
         label0 = labels[0]
-        assert label0.text.strip() == "ANALYSIS"
+        assert label0.text.strip().startswith("ANALYSIS")