diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml
index 464d1cef825f..4269db840770 100644
--- a/.github/workflows/lint_openapi_schema.yml
+++ b/.github/workflows/lint_openapi_schema.yml
@@ -28,6 +28,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Get full Python version
         id: full-python-version
         shell: bash
diff --git a/SECURITY.md b/SECURITY.md
index 2b30ab9b1106..c1dcb56f30e9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -16,8 +16,7 @@ The following branches or releases receive security support:
 
 - Development on the `dev` branch, hosted on GitHub, which will become the next release of Galaxy
 - Releases within the past 12 months.
-  - E.g. 16.04 will receive support until 2017-04. As the month changes to 2017-05 it will become unsupported.
-- There are currently no plans for Long Term Support (LTS) releases.
+  - E.g. 24.0 will receive support for a full year, at which point 25.0 will be available.
 
 For unsupported branches:
 
diff --git a/client/src/api/index.test.ts b/client/src/api/index.test.ts
index 42b666b2f03f..fb16bc95edc2 100644
--- a/client/src/api/index.test.ts
+++ b/client/src/api/index.test.ts
@@ -22,6 +22,7 @@ const REGISTERED_USER: User = {
 
 const ANONYMOUS_USER: AnonymousUser = {
     isAnonymous: true,
+    total_disk_usage: 0,
 };
 
 const SESSIONLESS_USER = null;
diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index d1dbc8854bbb..718fa099a45a 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -227,7 +227,7 @@ export interface User extends QuotaUsageResponse {
     username?: string;
 }
 
-export interface AnonymousUser {
+export interface AnonymousUser extends QuotaUsageResponse {
     id?: string;
     isAnonymous: true;
     is_admin?: false;
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index a8d706bbdfae..2db6faeb1963 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -6155,6 +6155,8 @@ export interface components {
              * @enum {string}
              */
             model_class: "HistoryDatasetAssociation";
+            /** Purged */
+            purged: boolean;
             /**
              * State
              * @description The current state of this dataset.
diff --git a/client/src/components/AboutGalaxy.vue b/client/src/components/AboutGalaxy.vue
index 4c40f4978d06..8dad39ed35b1 100644
--- a/client/src/components/AboutGalaxy.vue
+++ b/client/src/components/AboutGalaxy.vue
@@ -3,6 +3,7 @@
 /* (injected by webpack) */
 
 import { computed } from "vue";
+import { RouterLink } from "vue-router";
 
 import { useConfig } from "@/composables/config";
 import { getAppRoot } from "@/onload/loadConfig";
@@ -28,47 +29,88 @@ const versionUserDocumentationUrl = computed(() => {
 
 <template>
     <div v-if="isConfigLoaded" class="about-galaxy">
-        <Heading h1 :icon="['gxd', 'galaxyLogo']" size="xl">About This Galaxy</Heading>
-        <div>
-            <!-- Galaxy version (detailed), with a link to the release notes -->
-            <Heading h2 separator size="md">Galaxy Version Information</Heading>
-            <p>
-                The Galaxy Server is running version
+        <Heading h1 :icon="['gxd', 'galaxyLogo']" size="lg">Help and Support</Heading>
+        <div class="p-2">
+            <Heading h2 separator size="md">Support</Heading>
+            <div v-if="config.wiki_url">
+                <ExternalLink :href="config.wiki_url">
+                    <strong v-localize>Community Hub</strong>
+                </ExternalLink>
+                <p v-localize>Join our community and explore tutorials on using Galaxy and enhance your skills.</p>
+            </div>
+            <div v-if="config.helpsite_url">
+                <ExternalLink :href="config.helpsite_url">
+                    <strong v-localize>Ask Questions & Find Answers</strong>
+                </ExternalLink>
+                <p v-localize>
+                    Visit the Galaxy Q&A website to find answers to your questions and connect with other users.
+                </p>
+            </div>
+            <div v-if="config.support_url">
+                <ExternalLink :href="config.support_url">
+                    <strong v-localize>Reach Out</strong>
+                </ExternalLink>
+                <p v-localize>Need help or want to teach and learn more about Galaxy? Feel free to reach out to us.</p>
+            </div>
+            <Heading v-localize h2 separator size="md">Help</Heading>
+            <div>
+                <RouterLink to="tours">
+                    <strong v-localize>Interactive Tours</strong>
+                </RouterLink>
+                <p v-localize>Discover and learn about Galaxy with our interactive tours.</p>
+            </div>
+            <div v-if="config.screencasts_url">
+                <ExternalLink :href="config.screencasts_url">
+                    <strong v-localize>Videos and Screencasts</strong>
+                </ExternalLink>
+                <p v-localize>Learn more about Galaxy by watching videos and screencasts.</p>
+            </div>
+            <div v-if="config.citation_url">
+                <ExternalLink :href="config.citation_url">
+                    <strong v-localize>How to Cite Us</strong>
+                </ExternalLink>
+                <p v-localize>View details on how to properly cite Galaxy.</p>
+            </div>
+            <Heading h2 separator size="md">Technical Details</Heading>
+            <div>
+                <!-- Galaxy version (detailed), with a link to the release notes -->
                 <ExternalLink :href="versionUserDocumentationUrl">
-                    <strong> {{ config.version_major }}.{{ config.version_minor }}</strong> </ExternalLink
-                >, and the web client was built on <UtcDate :date="clientBuildDate" mode="pretty" />.
-            </p>
-            <template v-if="config.version_extra">
-                <p>The server also provides the following extra version information</p>
-                <ul>
-                    <li v-for="(value, name, index) in config.version_extra" :key="index">
-                        <strong>{{ name }}</strong>
-                        : {{ value }}
-                    </li>
-                </ul>
-            </template>
-        </div>
-        <div>
-            <Heading h2 separator size="md">Galaxy API Documentation</Heading>
-            <!-- API documentation link -->
-            <p>
-                The Galaxy API is available, and explorable, at
+                    <strong v-localize>Release Notes</strong>
+                </ExternalLink>
+                <p v-localize>
+                    This Galaxy server version is <strong>{{ config.version_major }}.{{ config.version_minor }}</strong
+                    >, and the web client was built on
+                    <strong><UtcDate :date="clientBuildDate" mode="pretty" /></strong>.
+                </p>
+                <template v-if="config.version_extra">
+                    <p v-localize>The server also provides the following extra version information</p>
+                    <ul>
+                        <li v-for="(value, name, index) in config.version_extra" :key="index">
+                            <strong>{{ name }}</strong>
+                            : {{ value }}
+                        </li>
+                    </ul>
+                </template>
+            </div>
+            <div>
                 <ExternalLink :href="apiDocsLink">
-                    {{ apiDocsLink }}
+                    <strong v-localize>API Documentation</strong>
                 </ExternalLink>
-            </p>
-        </div>
-        <div>
-            <Heading h2 separator size="md">License Information</Heading>
-            <p>The Galaxy Software is licensed under <License :license-id="galaxyLicense" /></p>
-        </div>
-        <div v-if="config.terms_url">
-            <!-- Terms, if available.-->
-            <Heading h2 separator size="md">Terms and Conditions</Heading>
-            <p>
-                This Galaxy Server has specified Terms and Conditions that apply to use of the service.
-                <ExternalLink :href="config.terms_url">Review them here.</ExternalLink>
-            </p>
+                <p v-localize>Explore the Galaxy API.</p>
+            </div>
+            <div>
+                <License class="font-weight-bold" :license-id="galaxyLicense" />
+                <p v-localize>The Galaxy Software is licensed under the MIT License.</p>
+            </div>
+            <div v-if="config.terms_url">
+                <!-- Terms, if available.-->
+                <ExternalLink :href="config.terms_url">
+                    <strong v-localize>Terms and Conditions</strong>
+                </ExternalLink>
+                <p v-localize>
+                    This Galaxy Server has specified Terms and Conditions that apply to use of the service.
+                </p>
+            </div>
         </div>
     </div>
 </template>
diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue
index 0d9f83fb3d05..cde4d7b190ad 100644
--- a/client/src/components/ActivityBar/ActivityBar.vue
+++ b/client/src/components/ActivityBar/ActivityBar.vue
@@ -179,11 +179,7 @@ watch(
                                 :to="activity.to"
                                 @click="onToggleSidebar()" />
                             <ActivityItem
-                                v-else-if="
-                                    ['admin', 'tools', 'visualizations', 'multiview', 'invocation'].includes(
-                                        activity.id
-                                    )
-                                "
+                                v-else-if="activity.id === 'admin' || activity.panel"
                                 :id="`activity-${activity.id}`"
                                 :key="activity.id"
                                 :icon="activity.icon"
@@ -216,10 +212,10 @@ watch(
                     @click="onToggleSidebar('notifications')" />
                 <ActivityItem
                     id="activity-settings"
-                    icon="cog"
+                    icon="ellipsis-h"
                     :is-active="isActiveSideBar('settings')"
-                    title="Settings"
-                    tooltip="Edit preferences"
+                    title="More"
+                    tooltip="View additional activities"
                     @click="onToggleSidebar('settings')" />
                 <ActivityItem
                     v-if="isAdmin"
diff --git a/client/src/components/ActivityBar/ActivitySettings.test.js b/client/src/components/ActivityBar/ActivitySettings.test.js
index e5555451ec85..2fd33b00d02e 100644
--- a/client/src/components/ActivityBar/ActivitySettings.test.js
+++ b/client/src/components/ActivityBar/ActivitySettings.test.js
@@ -19,7 +19,7 @@ function testActivity(id, newOptions = {}) {
         description: "activity-test-description",
         icon: "activity-test-icon",
         mutable: true,
-        optional: false,
+        optional: true,
         title: "activity-test-title",
         to: null,
         tooltip: "activity-test-tooltip",
@@ -56,22 +56,23 @@ describe("ActivitySettings", () => {
 
     it("availability of built-in activities", async () => {
         const items = wrapper.findAll(activityItemSelector);
-        expect(items.length).toBe(Activities.length);
+        const nOptional = Activities.filter((x) => x.optional).length;
+        expect(items.length).toBe(nOptional);
     });
 
-    it("visible but non-optional activity", async () => {
+    it("visible and optional activity", async () => {
         activityStore.setAll([testActivity("1")]);
         await wrapper.vm.$nextTick();
         const items = wrapper.findAll(activityItemSelector);
         expect(items.length).toBe(1);
-        const pinnedCheckbox = items.at(0).find("[data-icon='thumbtack']");
-        expect(pinnedCheckbox.exists()).toBeTruthy();
-        const pinnedIcon = wrapper.find("[icon='activity-test-icon'");
-        expect(pinnedIcon.exists()).toBeTruthy();
+        const checkbox = items.at(0).find("[title='Hide in Activity Bar']");
+        expect(checkbox.exists()).toBeTruthy();
+        const icon = wrapper.find("[icon='activity-test-icon'");
+        expect(icon.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeTruthy();
-        pinnedCheckbox.trigger("click");
+        checkbox.trigger("click");
         await wrapper.vm.$nextTick();
-        expect(activityStore.getAll()[0].visible).toBeTruthy();
+        expect(activityStore.getAll()[0].visible).toBeFalsy();
     });
 
     it("non-visible but optional activity", async () => {
@@ -84,12 +85,12 @@ describe("ActivitySettings", () => {
         await wrapper.vm.$nextTick();
         const items = wrapper.findAll(activityItemSelector);
         expect(items.length).toBe(1);
-        const hiddenCheckbox = items.at(0).find("[data-icon='square']");
-        expect(hiddenCheckbox.exists()).toBeTruthy();
+        const checkbox = items.at(0).find("[title='Show in Activity Bar']");
+        expect(checkbox.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeFalsy();
-        hiddenCheckbox.trigger("click");
+        checkbox.trigger("click");
         await wrapper.vm.$nextTick();
-        const visibleCheckbox = items.at(0).find("[data-icon='check-square']");
+        const visibleCheckbox = items.at(0).find("[title='Hide in Activity Bar']");
         expect(visibleCheckbox.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeTruthy();
     });
diff --git a/client/src/components/ActivityBar/ActivitySettings.vue b/client/src/components/ActivityBar/ActivitySettings.vue
index 835691d3c0b3..fe2ecce28dd5 100644
--- a/client/src/components/ActivityBar/ActivitySettings.vue
+++ b/client/src/components/ActivityBar/ActivitySettings.vue
@@ -1,16 +1,19 @@
 <script setup lang="ts">
 import { library } from "@fortawesome/fontawesome-svg-core";
-import { faSquare } from "@fortawesome/free-regular-svg-icons";
-import { faCheckSquare, faThumbtack, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faSquare, faStar as faStarRegular } from "@fortawesome/free-regular-svg-icons";
+import { faCheckSquare, faStar, faThumbtack, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { storeToRefs } from "pinia";
 import { computed, type ComputedRef } from "vue";
 
+import { useActivityAction } from "@/composables/useActivityAction";
 import { type Activity, useActivityStore } from "@/stores/activityStore";
 
 library.add({
     faCheckSquare,
     faSquare,
+    faStar,
+    faStarRegular,
     faTrash,
     faThumbtack,
 });
@@ -21,6 +24,7 @@ const props = defineProps<{
 
 const activityStore = useActivityStore();
 const { activities } = storeToRefs(activityStore);
+const activityAction = useActivityAction();
 
 const filteredActivities = computed(() => {
     if (props.query?.length > 0) {
@@ -44,7 +48,7 @@ const foundActivities: ComputedRef<boolean> = computed(() => {
     return filteredActivities.value.length > 0;
 });
 
-function onClick(activity: Activity) {
+function onFavorite(activity: Activity) {
     if (activity.optional) {
         activity.visible = !activity.visible;
     }
@@ -59,36 +63,49 @@ function onRemove(activity: Activity) {
     <div class="activity-settings rounded no-highlight">
         <div v-if="foundActivities" class="activity-settings-content">
             <div v-for="activity in filteredActivities" :key="activity.id">
-                <button class="activity-settings-item p-2 cursor-pointer" @click="onClick(activity)">
+                <button
+                    v-if="activity.optional"
+                    class="activity-settings-item p-2 cursor-pointer"
+                    @click="activityAction.executeActivity(activity)">
                     <div class="d-flex justify-content-between align-items-start">
-                        <span class="w-100">
-                            <FontAwesomeIcon
-                                v-if="!activity.optional"
-                                class="icon-check mr-1"
-                                icon="fas fa-thumbtack"
-                                fa-fw />
-                            <FontAwesomeIcon
-                                v-else-if="activity.visible"
-                                class="icon-check mr-1"
-                                icon="fas fa-check-square"
-                                fa-fw />
-                            <FontAwesomeIcon v-else class="mr-1" icon="far fa-square" fa-fw />
+                        <span class="d-flex justify-content-between w-100">
                             <span>
                                 <icon class="mr-1" :icon="activity.icon" />
                                 <span v-localize class="font-weight-bold">{{
                                     activity.title || "No title available"
                                 }}</span>
                             </span>
+                            <div>
+                                <BButton
+                                    v-if="activity.mutable"
+                                    v-b-tooltip.hover
+                                    data-description="delete activity"
+                                    size="sm"
+                                    title="Delete Activity"
+                                    variant="link"
+                                    @click.stop="onRemove(activity)">
+                                    <FontAwesomeIcon icon="fa-trash" fa-fw />
+                                </BButton>
+                                <BButton
+                                    v-if="activity.visible"
+                                    v-b-tooltip.hover
+                                    size="sm"
+                                    title="Hide in Activity Bar"
+                                    variant="link"
+                                    @click.stop="onFavorite(activity)">
+                                    <FontAwesomeIcon icon="fas fa-star" fa-fw />
+                                </BButton>
+                                <BButton
+                                    v-else
+                                    v-b-tooltip.hover
+                                    size="sm"
+                                    title="Show in Activity Bar"
+                                    variant="link"
+                                    @click.stop="onFavorite(activity)">
+                                    <FontAwesomeIcon icon="far fa-star" fa-fw />
+                                </BButton>
+                            </div>
                         </span>
-                        <b-button
-                            v-if="activity.mutable"
-                            data-description="delete activity"
-                            class="button-delete"
-                            size="sm"
-                            variant="link"
-                            @click.stop="onRemove(activity)">
-                            <FontAwesomeIcon icon="fa-trash" fa-fw />
-                        </b-button>
                     </div>
                     <div v-localize class="text-muted">
                         {{ activity.description || "No description available" }}
@@ -121,13 +138,6 @@ function onRemove(activity: Activity) {
     text-align: left;
     transition: none;
     width: 100%;
-
-    .icon-check {
-        color: darken($brand-success, 15%);
-    }
-    .button-delete {
-        background: transparent;
-    }
 }
 .activity-settings-item:hover {
     background: $gray-200;
diff --git a/client/src/components/Common/FilterMenu.test.ts b/client/src/components/Common/FilterMenu.test.ts
index 8474981948dc..ee14d18a73d3 100644
--- a/client/src/components/Common/FilterMenu.test.ts
+++ b/client/src/components/Common/FilterMenu.test.ts
@@ -3,7 +3,7 @@ import { getLocalVue } from "@tests/jest/helpers";
 import { mount, Wrapper } from "@vue/test-utils";
 
 import { HistoryFilters } from "@/components/History/HistoryFilters";
-import { WorkflowFilters } from "@/components/Workflow/WorkflowFilters";
+import { WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters";
 import Filtering, { compare, contains, equals, toBool, toDate } from "@/utils/filtering";
 
 import FilterMenu from "./FilterMenu.vue";
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
index 6e2e6138ca00..8224ae89b030 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
@@ -1,6 +1,7 @@
 <template>
     <div>
         <FolderTopBar
+            :canAddLibraryItem="canAddLibraryItem"
             :folder-contents="folderContents"
             :include-deleted.sync="includeDeleted"
             :folder_id="currentFolderId"
@@ -285,6 +286,7 @@ Vue.use(BootstrapVue);
 
 function initialFolderState() {
     return {
+        canAddLibraryItem: false,
         selected: [],
         unselected: [],
         expandedMessage: [],
@@ -387,6 +389,7 @@ export default {
                 .then((response) => {
                     this.folderContents = response.folder_contents;
                     this.folder_metadata = response.metadata;
+                    this.canAddLibraryItem = response.metadata.can_add_library_item;
                     this.total_rows = response.metadata.total_rows;
                     if (this.isAllSelectedMode) {
                         this.selected = [];
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
index cfdd97f1c429..de3b1c052e5b 100644
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -12,7 +12,7 @@
                 <div class="form-inline">
                     <SearchField @updateSearch="updateSearch($event)"></SearchField>
                     <button
-                        v-if="metadata.can_add_library_item"
+                        v-if="canAddLibraryItem"
                         title="Create new folder"
                         class="btn btn-secondary toolbtn-create-folder add-library-items add-library-items-folder mr-1"
                         type="button"
@@ -20,7 +20,7 @@
                         <FontAwesomeIcon icon="plus" />
                         Folder
                     </button>
-                    <div v-if="metadata.can_add_library_item">
+                    <div v-if="canAddLibraryItem">
                         <div
                             title="Add datasets to current folder"
                             class="dropdown add-library-items add-library-items-datasets mr-1">
@@ -168,6 +168,10 @@ export default {
             type: Array,
             required: true,
         },
+        canAddLibraryItem: {
+            type: Boolean,
+            default: false,
+        },
         metadata: {
             type: Object,
             required: true,
diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js
index 58a7a88137fa..f299b5b2500f 100644
--- a/client/src/components/Masthead/Masthead.test.js
+++ b/client/src/components/Masthead/Masthead.test.js
@@ -1,21 +1,20 @@
 import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
 import { WindowManager } from "layout/window-manager";
-import { PiniaVuePlugin, setActivePinia } from "pinia";
-import { useEntryPointStore } from "stores/entryPointStore";
+import { PiniaVuePlugin } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
 
 import { mockFetcher } from "@/api/schema/__mocks__";
 
 import { loadWebhookMenuItems } from "./_webhooks";
-import { getActiveTab } from "./utilities";
 
-import { default as Masthead } from "./Masthead.vue";
+import Masthead from "./Masthead.vue";
 
 jest.mock("app");
 jest.mock("./_webhooks");
 jest.mock("vue-router/composables", () => ({
     useRoute: jest.fn(() => ({ name: "Home" })),
+    useRouter: jest.fn(),
 }));
 jest.mock("@/api/schema");
 
@@ -23,14 +22,12 @@ describe("Masthead.vue", () => {
     let wrapper;
     let localVue;
     let windowManager;
-    let tabs;
     let testPinia;
 
     function stubLoadWebhooks(items) {
         items.push({
             id: "extension",
             title: "Extension Point",
-            menu: false,
             url: "extension_url",
         });
     }
@@ -43,75 +40,22 @@ describe("Masthead.vue", () => {
         testPinia = createTestingPinia();
         mockFetcher.path("/api/configuration").method("get").mock({ data: {} });
 
-        tabs = [
-            // Main Analysis Tab..
-            {
-                id: "analysis",
-                title: "Analyze",
-                menu: false,
-                url: "root",
-            },
-            {
-                id: "shared",
-                title: "Shared Items",
-                menu: [{ title: "_menu_title", url: "_menu_url", target: "_menu_target" }],
-            },
-            // Hidden tab (pre-Vue framework supported this, not sure it is used
-            // anywhere?)
-            {
-                id: "hiddentab",
-                title: "Hidden Title",
-                menu: false,
-                hidden: true,
-            },
-        ];
-
-        const initialActiveTab = "shared";
         windowManager = new WindowManager({});
         const windowTab = windowManager.getTab();
         wrapper = mount(Masthead, {
             propsData: {
-                tabs,
                 windowTab,
-                initialActiveTab,
             },
             localVue,
             pinia: testPinia,
         });
     });
 
-    it("test basic active tab matching", () => {
-        expect(getActiveTab("root", tabs)).toBe("analysis");
-        expect(getActiveTab("_menu_url", tabs)).toBe("shared");
-    });
-
     it("should render simple tab item links", () => {
-        expect(wrapper.findAll("li.nav-item").length).toBe(6);
+        expect(wrapper.findAll("li.nav-item").length).toBe(4);
         // Ensure specified link title respected.
-        expect(wrapper.find("#analysis a").text()).toBe("Analyze");
-        expect(wrapper.find("#analysis a").attributes("href")).toBe("root");
-    });
-
-    it("should render tab items with menus", () => {
-        // Ensure specified link title respected.
-        expect(wrapper.find("#shared a").text()).toBe("Shared Items");
-        expect(wrapper.find("#shared").classes("dropdown")).toBe(true);
-
-        expect(wrapper.findAll("#shared .dropdown-menu li").length).toBe(1);
-        expect(wrapper.find("#shared .dropdown-menu li a").attributes().href).toBe("_menu_url");
-        expect(wrapper.find("#shared .dropdown-menu li a").attributes().target).toBe("_menu_target");
-        expect(wrapper.find("#shared .dropdown-menu li a").text()).toBe("_menu_title");
-    });
-
-    it("should make hidden tabs hidden", () => {
-        expect(wrapper.find("#analysis").attributes().style).not.toEqual(expect.stringContaining("display: none"));
-        expect(wrapper.find("#hiddentab").attributes().style).toEqual(expect.stringContaining("display: none"));
-        expect(wrapper.get("#interactive").isVisible()).toBeFalsy();
-    });
-
-    it("should highlight the active tab", () => {
-        expect(wrapper.find("#analysis").classes("active")).toBe(false);
-        expect(wrapper.find("#shared").classes("active")).toBe(true);
+        expect(wrapper.find("#help").text()).toBe("Support, Contact, and Community");
+        expect(wrapper.find("#help a").attributes("href")).toBe("/about");
     });
 
     it("should display window manager button", async () => {
@@ -124,24 +68,4 @@ describe("Masthead.vue", () => {
     it("should load webhooks on creation", async () => {
         expect(wrapper.find("#extension a").text()).toBe("Extension Point");
     });
-
-    it("shows link to interactive tools if any is active", async () => {
-        setActivePinia(testPinia);
-        const entryPointStore = useEntryPointStore();
-        entryPointStore.entryPoints = [
-            {
-                model_class: "InteractiveToolEntryPoint",
-                id: "52e496b945151ee8",
-                job_id: "52e496b945151ee8",
-                name: "Jupyter Interactive Tool",
-                active: true,
-                created_time: "2020-02-24T15:59:18.122103",
-                modified_time: "2020-02-24T15:59:20.428594",
-                target: "http://52e496b945151ee8-be8a5bee5d5849a5b4e035b51305256e.interactivetoolentrypoint.interactivetool.localhost:8080/ipython/lab",
-            },
-        ];
-        // avoid race condition with store's reactivity
-        await new Promise((_) => setTimeout(_, 10));
-        expect(wrapper.get("#interactive").isVisible()).toBeTruthy();
-    });
 });
diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue
index 0390029c3951..d8738c1bb58d 100644
--- a/client/src/components/Masthead/Masthead.vue
+++ b/client/src/components/Masthead/Masthead.vue
@@ -1,41 +1,29 @@
 <script setup>
 import { BNavbar, BNavbarBrand, BNavbarNav } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
-import { useEntryPointStore } from "stores/entryPointStore";
+import { userLogout } from "utils/logout";
 import { withPrefix } from "utils/redirect";
-import { onBeforeMount, onMounted, reactive, ref, watch } from "vue";
-import { useRoute } from "vue-router/composables";
+import { onMounted, ref } from "vue";
+import { useRouter } from "vue-router/composables";
 
 import { useConfig } from "@/composables/config";
 import { useUserStore } from "@/stores/userStore";
 
 import { loadWebhookMenuItems } from "./_webhooks";
+import MastheadDropdown from "./MastheadDropdown";
 import MastheadItem from "./MastheadItem";
 import QuotaMeter from "./QuotaMeter";
-import { getActiveTab } from "./utilities";
 
-import NotificationsBell from "@/components/Notifications/NotificationsBell.vue";
+const { isAnonymous, currentUser } = storeToRefs(useUserStore());
 
-const { isAnonymous } = storeToRefs(useUserStore());
-
-const route = useRoute();
+const router = useRouter();
 const { config, isConfigLoaded } = useConfig();
 
-const emit = defineEmits(["open-url"]);
-
 const props = defineProps({
-    tabs: {
-        type: Array,
-        default: () => [],
-    },
     brand: {
         type: String,
         default: null,
     },
-    initialActiveTab: {
-        type: String,
-        default: "analysis",
-    },
     logoUrl: {
         type: String,
         default: null,
@@ -54,49 +42,29 @@ const props = defineProps({
     },
 });
 
-const activeTab = ref(props.initialActiveTab);
 const extensionTabs = ref([]);
 const windowToggle = ref(false);
 
-let entryPointStore;
-const itsMenu = reactive({
-    id: "interactive",
-    url: "/interactivetool_entry_points/list",
-    tooltip: "See Running Interactive Tools",
-    icon: "fa-cogs",
-    hidden: true,
-});
-
-function setActiveTab() {
-    const currentRoute = route.path;
-    activeTab.value = getActiveTab(currentRoute, props.tabs) || activeTab.value;
+function openUrl(url, target = null) {
+    if (!target) {
+        router.push(url);
+    } else {
+        url = withPrefix(url);
+        if (target == "_blank") {
+            window.open(url);
+        } else {
+            window.location = url;
+        }
+    }
 }
 
 function onWindowToggle() {
     windowToggle.value = !windowToggle.value;
-}
-function updateVisibility(isActive) {
-    itsMenu.hidden = !isActive;
+    props.windowTab.onclick();
 }
 
-watch(
-    () => route.path,
-    () => {
-        setActiveTab();
-    }
-);
-
-/* lifecyle */
-onBeforeMount(() => {
-    entryPointStore = useEntryPointStore();
-    entryPointStore.startWatchingEntryPoints();
-    entryPointStore.$subscribe((mutation, state) => {
-        updateVisibility(state.entryPoints.length > 0);
-    });
-});
 onMounted(() => {
     loadWebhookMenuItems(extensionTabs.value);
-    setActiveTab();
 });
 </script>
 
@@ -104,47 +72,79 @@ onMounted(() => {
     <BNavbar id="masthead" type="dark" role="navigation" aria-label="Main" class="justify-content-between">
         <BNavbarNav>
             <BNavbarBrand
+                id="analysis"
                 v-b-tooltip.hover
-                class="ml-2 mr-2"
+                class="ml-2 mr-2 p-0"
                 title="Home"
                 aria-label="homepage"
                 :href="withPrefix(logoUrl)">
                 <img alt="logo" :src="withPrefix(logoSrc)" />
                 <img v-if="logoSrcSecondary" alt="logo" :src="withPrefix(logoSrcSecondary)" />
             </BNavbarBrand>
-            <span v-if="brand" class="navbar-text px-2">
+            <span v-if="brand" class="navbar-text py-0 px-2">
                 {{ brand }}
             </span>
         </BNavbarNav>
-        <BNavbarNav>
+        <BNavbarNav v-if="isConfigLoaded" class="mr-1">
             <MastheadItem
-                v-for="(tab, idx) in props.tabs"
-                v-show="tab.hidden !== true"
-                :key="`tab-${idx}`"
-                :tab="tab"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
-            <MastheadItem
-                v-show="itsMenu.hidden !== true"
-                :key="`its-tab`"
-                :tab="itsMenu"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
+                v-if="windowTab"
+                :id="windowTab.id"
+                :icon="windowTab.icon"
+                :toggle="windowToggle"
+                :tooltip="windowTab.tooltip"
+                @click="onWindowToggle" />
             <MastheadItem
                 v-for="(tab, idx) in extensionTabs"
                 v-show="tab.hidden !== true"
+                :id="tab.id"
                 :key="`extension-tab-${idx}`"
-                :tab="tab"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
-            <MastheadItem v-if="windowTab" :tab="windowTab" :toggle="windowToggle" @click="onWindowToggle" />
-            <BNavItem
-                v-if="!isAnonymous && isConfigLoaded && config.enable_notification_system"
-                id="notifications-bell">
-                <NotificationsBell tooltip-placement="bottom" />
-            </BNavItem>
+                :title="tab.title"
+                :icon="tab.icon"
+                :url="tab.url"
+                :tooltip="tab.tooltip"
+                :target="tab.target"
+                @click="tab.onclick ? tab.onclick : undefined" />
+            <MastheadItem
+                id="help"
+                icon="fa-question"
+                url="/about"
+                tooltip="Support, Contact, and Community"
+                @click="openUrl('/about')" />
+            <QuotaMeter />
+            <MastheadItem
+                v-if="isAnonymous && config.allow_user_creation"
+                id="user"
+                class="loggedout-only"
+                title="Login or Register"
+                @click="openUrl('/login/start')" />
+            <MastheadItem
+                v-if="isAnonymous && !config.allow_user_creation"
+                id="user"
+                class="loggedout-only"
+                title="Login"
+                @click="openUrl('/login/start')" />
+            <MastheadDropdown
+                v-if="!isAnonymous && !config.single_user"
+                id="user"
+                class="loggedin-only"
+                icon="fa-user"
+                :title="currentUser.username"
+                tooltip="User Preferences"
+                :menu="[
+                    {
+                        title: 'Preferences',
+                        icon: 'fa-gear',
+                        handler: () => openUrl('/user'),
+                    },
+                    {
+                        title: 'Sign Out',
+                        icon: 'fa-sign-out-alt',
+                        handler: () => userLogout(),
+                    },
+                ]"
+                @click="userLogout" />
         </BNavbarNav>
-        <QuotaMeter />
+        <Icon v-else icon="spinner" class="fa-spin mr-2 text-light" />
     </BNavbar>
 </template>
 
@@ -180,16 +180,18 @@ onMounted(() => {
                 cursor: pointer;
                 text-decoration: none;
                 color: var(--masthead-text-color);
+                margin-right: 0.25rem;
+                margin-left: 0.25rem;
                 &:hover {
                     color: var(--masthead-text-hover);
                 }
                 &.nav-icon {
-                    font-size: 1.3em;
+                    font-size: 1.2em;
                     .nav-note {
                         position: absolute;
-                        left: 1.9rem;
-                        top: 1.9rem;
-                        font-size: 0.6rem;
+                        left: 1.6rem;
+                        top: 1.6rem;
+                        font-size: 0.4rem;
                         font-weight: bold;
                     }
                 }
@@ -201,11 +203,12 @@ onMounted(() => {
     }
     .navbar-brand {
         cursor: pointer;
+        line-height: $masthead-height;
         img {
             filter: $text-shadow;
             display: inline;
             border: none;
-            height: 2.3rem;
+            height: 2rem;
         }
     }
     .navbar-text {
@@ -213,7 +216,7 @@ onMounted(() => {
         font-weight: bold;
         font-family: Verdana, sans-serif;
         font-size: 1rem;
-        line-height: 2rem;
+        line-height: $masthead-height;
         color: var(--masthead-text-color);
     }
 }
diff --git a/client/src/components/Masthead/MastheadDropdown.vue b/client/src/components/Masthead/MastheadDropdown.vue
new file mode 100644
index 000000000000..02bd10771694
--- /dev/null
+++ b/client/src/components/Masthead/MastheadDropdown.vue
@@ -0,0 +1,48 @@
+<script setup>
+import { BDropdownItem, BNavItemDropdown, VBTooltipPlugin } from "bootstrap-vue";
+import Vue, { ref } from "vue";
+
+import TextShort from "@/components/Common/TextShort.vue";
+
+Vue.use(VBTooltipPlugin);
+
+const dropdown = ref(null);
+
+/* props */
+defineProps({
+    id: {
+        type: String,
+    },
+    icon: {
+        type: String,
+    },
+    target: {
+        type: String,
+    },
+    title: {
+        type: String,
+    },
+    tooltip: {
+        type: String,
+    },
+    menu: {
+        type: Array,
+    },
+});
+</script>
+
+<template>
+    <BNavItemDropdown :id="id" ref="dropdown" v-b-tooltip.noninteractive.hover.bottom :title="tooltip" right>
+        <template v-if="icon" v-slot:button-content>
+            <span class="sr-only">{{ tooltip || id }}</span>
+            <span class="fa fa-fw" :class="icon" />
+            <TextShort :text="title" />
+        </template>
+        <template>
+            <BDropdownItem v-for="(item, idx) in menu" :key="idx" role="menuitem" @click="item.handler">
+                <span class="fa fa-fw" :class="item.icon" />
+                <span>{{ item.title }}</span>
+            </BDropdownItem>
+        </template>
+    </BNavItemDropdown>
+</template>
diff --git a/client/src/components/Masthead/MastheadItem.test.js b/client/src/components/Masthead/MastheadItem.test.js
deleted file mode 100644
index 68e8780c00c0..000000000000
--- a/client/src/components/Masthead/MastheadItem.test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { mount } from "@vue/test-utils";
-import { getLocalVue } from "tests/jest/helpers";
-
-import MastheadItem from "./MastheadItem.vue";
-
-describe("MastheadItem.vue", () => {
-    let wrapper;
-    let localVue;
-
-    beforeEach(() => {
-        localVue = getLocalVue();
-    });
-
-    function m(active, menu) {
-        const tab = {
-            id: "mytab",
-            menu: menu,
-        };
-
-        return mount(MastheadItem, {
-            propsData: {
-                tab,
-                activeTab: active,
-            },
-            localVue,
-        });
-    }
-
-    it("should render active tab with menus", async () => {
-        wrapper = m("mytab", true);
-        expect(wrapper.classes("active")).toBe(true);
-        expect(wrapper.classes("b-nav-dropdown")).toBe(true);
-    });
-
-    it("should render inactive tabs without menus", async () => {
-        wrapper = m("othertab", false);
-        expect(wrapper.classes("active")).toBe(false);
-        expect(wrapper.classes("b-nav-dropdown")).toBe(false);
-    });
-});
diff --git a/client/src/components/Masthead/MastheadItem.vue b/client/src/components/Masthead/MastheadItem.vue
index 889526e01ffa..f3c1ca5c3ab5 100644
--- a/client/src/components/Masthead/MastheadItem.vue
+++ b/client/src/components/Masthead/MastheadItem.vue
@@ -1,125 +1,57 @@
 <script setup>
-import { BDropdownItem, BNavItem, BNavItemDropdown, VBPopoverPlugin, VBTooltipPlugin } from "bootstrap-vue";
+import { BNavItem, VBTooltipPlugin } from "bootstrap-vue";
 import { withPrefix } from "utils/redirect";
-import Vue, { computed, getCurrentInstance, ref } from "vue";
+import Vue from "vue";
 
-Vue.use(VBPopoverPlugin);
 Vue.use(VBTooltipPlugin);
 
-const instance = getCurrentInstance().proxy;
-const emit = defineEmits(["click", "open-url"]);
-const dropdown = ref(null);
-
 /* props */
-const props = defineProps({
-    tab: {
-        type: Object,
-        default: null,
+defineProps({
+    disabled: {
+        type: Boolean,
+    },
+    id: {
+        type: String,
+    },
+    icon: {
+        type: String,
+    },
+    target: {
+        type: String,
+    },
+    title: {
+        type: String,
+    },
+    tooltip: {
+        type: String,
     },
     toggle: {
         type: Boolean,
         default: false,
     },
-    activeTab: {
+    url: {
         type: String,
-        default: null,
     },
 });
-
-/* computed */
-const menu = computed(() => props.tab.menu);
-const popoverNote = computed(
-    () => `Please <a href="${withPrefix("/login")}">log in or register</a> to use this feature.`
-);
-const classes = computed(() => {
-    const isActiveTab = props.tab.id == props.activeTab;
-    return Object.fromEntries([
-        ["active", isActiveTab],
-        [props.tab.cls, !!props.tab.cls],
-    ]);
-});
-const linkClasses = computed(() => ({
-    "nav-icon": props.tab.icon,
-    toggle: props.toggle,
-}));
-const iconClasses = computed(() =>
-    Object.fromEntries([
-        ["fa fa-fw", true],
-        [props.tab.icon, !!props.tab.icon],
-    ])
-);
-
-/* methods */
-function open(tab, event) {
-    if (tab.onclick) {
-        event.preventDefault();
-        tab.onclick();
-        emit("click");
-    } else if (tab.disabled) {
-        event.preventDefault();
-        instance.$root.$emit("bv::hide::tooltip");
-        instance.$root.$emit("bv::show::popover", tab.id);
-        setTimeout(() => {
-            instance.$root.$emit("bv::hide::popover", tab.id);
-        }, 3000);
-    } else if (!tab.menu) {
-        event.preventDefault();
-        emit("open-url", { ...tab });
-    }
-}
 </script>
 
 <template>
     <BNavItem
-        v-if="!menu"
-        :id="tab.id"
-        v-b-tooltip.hover.bottom
-        v-b-popover.manual.bottom="{ id: tab.id, content: popoverNote, html: true }"
-        :class="classes"
-        :href="withPrefix(tab.url)"
-        :target="tab.target || '_parent'"
-        :link-classes="linkClasses"
-        :title="tab.tooltip"
-        @click="open(tab, $event)">
-        <template v-if="tab.icon">
+        :id="id"
+        v-b-tooltip.noninteractive.hover.bottom
+        :href="withPrefix(url)"
+        :target="target || '_parent'"
+        :link-classes="{ 'nav-icon': !!icon, toggle: toggle }"
+        :title="tooltip"
+        @click.prevent="$emit('click')">
+        <template v-if="icon">
             <!-- If this is an icon-based tab, inject tooltip directly for screen readers -->
-            <span class="sr-only">{{ tab.tooltip || tab.id }}</span>
-            <span :class="iconClasses" />
+            <span class="sr-only">{{ tooltip || id }}</span>
+            <span :class="`fa fa-fw ${icon}`" />
             <span v-if="toggle" class="nav-note fa fa-check" />
         </template>
         <template v-else>
-            {{ tab.title }}
+            {{ title }}
         </template>
     </BNavItem>
-    <BNavItemDropdown
-        v-else
-        :id="tab.id"
-        ref="dropdown"
-        v-b-tooltip.hover.bottom
-        v-b-popover.manual.bottom="{ id: tab.id, content: popoverNote, html: true }"
-        :class="classes"
-        :text="tab.title"
-        href="#"
-        :title="tab.tooltip"
-        @show="open(tab, $event)">
-        <template v-if="tab.icon" v-slot:button-content>
-            <span class="sr-only">{{ tab.tooltip || tab.id }}</span>
-            <span :class="iconClasses" />
-        </template>
-        <template v-for="(item, idx) in tab.menu">
-            <div v-if="item.divider" :key="`divider-${idx}`" class="dropdown-divider" />
-            <BDropdownItem
-                v-else-if="item.hidden !== true"
-                :key="`item-${idx}`"
-                :href="withPrefix(item.url)"
-                :target="item.target || '_parent'"
-                role="menuitem"
-                title=""
-                :active="item.disabled"
-                :disabled="item.disabled"
-                @click="open(item, $event)">
-                {{ item.title }}
-            </BDropdownItem>
-        </template>
-    </BNavItemDropdown>
 </template>
diff --git a/client/src/components/Masthead/QuotaMeter.test.ts b/client/src/components/Masthead/QuotaMeter.test.ts
index 583543cb38ad..3599cc2d754a 100644
--- a/client/src/components/Masthead/QuotaMeter.test.ts
+++ b/client/src/components/Masthead/QuotaMeter.test.ts
@@ -3,21 +3,28 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
-import { mockFetcher } from "@/api/schema/__mocks__";
 import { useUserStore } from "@/stores/userStore";
 
 import QuotaMeter from "./QuotaMeter.vue";
 
 jest.mock("@/api/schema");
 
+let configValues = { enable_quotas: true };
+
+jest.mock("@/composables/config", () => ({
+    useConfig: jest.fn(() => ({
+        config: { value: { ...configValues } },
+        isConfigLoaded: true,
+    })),
+}));
+
 const localVue = getLocalVue();
 
 async function createQuotaMeterWrapper(config: any, userData: any) {
-    mockFetcher.path("/api/configuration").method("get").mock({ data: config });
+    configValues = { ...config };
     const pinia = createTestingPinia();
     const userStore = useUserStore();
     userStore.currentUser = { ...userStore.currentUser, ...userData };
-
     const wrapper = mount(QuotaMeter, {
         localVue,
         pinia,
@@ -31,52 +38,36 @@ describe("QuotaMeter.vue", () => {
         const user = {
             total_disk_usage: 5120,
             quota_percent: 50,
+            quota: "100 MB",
         };
-
         const config = { enable_quotas: true };
         const wrapper = await createQuotaMeterWrapper(config, user);
-
-        expect(wrapper.find(".quota-progress > span").text()).toBe("Using 50%");
+        expect(wrapper.find(".quota-progress > span").text()).toBe("Using 50% of 100 MB");
     });
 
     it("changes appearance depending on usage", async () => {
         const config = { enable_quotas: true };
-
         {
             const user = { quota_percent: 30 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-success");
         }
-
         {
             const user = { quota_percent: 80 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-warning");
         }
-
         {
             const user = { quota_percent: 95 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-danger");
         }
     });
 
-    it("prompts user to log in", async () => {
+    it("displays tooltip", async () => {
         const config = { enable_quotas: true };
         const wrapper = await createQuotaMeterWrapper(config, {});
-
-        expect(wrapper.find(".quota-meter > a").attributes("title")).toContain("Log in");
-    });
-
-    it("shows total usage in title", async () => {
-        const user = { total_disk_usage: 9216 };
-        const config = { enable_quotas: true };
-        const wrapper = await createQuotaMeterWrapper(config, user);
-
-        expect(wrapper.find(".quota-progress").attributes("title")).toContain("9 KB");
+        expect(wrapper.attributes("title")).toContain("Storage");
     });
 
     it("shows total usage when there is no quota", async () => {
@@ -84,22 +75,16 @@ describe("QuotaMeter.vue", () => {
             const user = { total_disk_usage: 7168 };
             const config = { enable_quotas: false };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
-            expect(wrapper.find(".quota-text > a").text()).toBe("Using 7 KB");
-            expect(wrapper.find(".quota-text > a").attributes("title")).not.toContain("7 KB");
+            expect(wrapper.find("span").text()).toBe("Using 7 KB");
         }
-
         {
             const user = {
                 total_disk_usage: 21504,
                 quota: "unlimited",
             };
-
             const config = { enable_quotas: true };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
-            expect(wrapper.find(".quota-text > a").text()).toBe("Using 21 KB");
-            expect(wrapper.find(".quota-text > a").attributes("title")).not.toContain("21 KB");
+            expect(wrapper.find("span").text()).toBe("Using 21 KB");
         }
     });
 });
diff --git a/client/src/components/Masthead/QuotaMeter.vue b/client/src/components/Masthead/QuotaMeter.vue
index c2ddf28525c1..fe6ad9e1fcff 100644
--- a/client/src/components/Masthead/QuotaMeter.vue
+++ b/client/src/components/Masthead/QuotaMeter.vue
@@ -1,114 +1,77 @@
-<template>
-    <div>
-        <div v-if="!hasQuota" class="quota-text d-flex align-items-center">
-            <b-link
-                v-b-tooltip.hover.left
-                to="/storage"
-                :disabled="isAnonymous"
-                class="ml-auto"
-                :title="title"
-                data-description="storage dashboard link">
-                {{ usingString + " " + totalUsageString }}
-            </b-link>
-        </div>
-        <div v-else class="quota-meter d-flex align-items-center">
-            <b-link
-                v-b-tooltip.hover.left
-                class="quota-progress"
-                :disabled="isAnonymous"
-                to="/storage"
-                :title="title"
-                data-description="storage dashboard link">
-                <b-progress :max="100">
-                    <b-progress-bar aria-label="Quota usage" :value="usage" :variant="variant" />
-                </b-progress>
-                <span>{{ usingString + " " + usage.toFixed(0) }}%</span>
-            </b-link>
-        </div>
-    </div>
-</template>
+<script setup lang="ts">
+import { BLink, BProgress, BProgressBar } from "bootstrap-vue";
+import { storeToRefs } from "pinia";
+import { computed } from "vue";
 
-<script>
-import { mapState } from "pinia";
-import { bytesToString } from "utils/utils";
-
-import { useConfigStore } from "@/stores/configurationStore";
+import { useConfig } from "@/composables/config";
 import { useUserStore } from "@/stores/userStore";
+import { bytesToString } from "@/utils/utils";
+
+const { config } = useConfig();
+const { currentUser, isAnonymous } = storeToRefs(useUserStore());
+
+const hasQuota = computed(() => {
+    const quotasEnabled = config.value.enable_quotas ?? false;
+    const quotaLimited = currentUser.value?.quota !== "unlimited" ?? false;
+    return quotasEnabled && quotaLimited;
+});
 
-export default {
-    name: "QuotaMeter",
-    data() {
-        return {
-            usingString: this.l("Using"),
-        };
-    },
-    computed: {
-        ...mapState(useConfigStore, ["config"]),
-        ...mapState(useUserStore, ["currentUser", "isAnonymous"]),
-        hasQuota() {
-            const quotasEnabled = this.config?.enable_quotas ?? false;
-            const quotaLimited = this.currentUser?.quota !== "unlimited" ?? false;
+const quotaLimit = computed(() => currentUser.value?.quota ?? 0);
 
-            return quotasEnabled && quotaLimited;
-        },
-        usage() {
-            if (this.hasQuota) {
-                return this.currentUser?.quota_percent ?? 0;
-            } else {
-                return this.currentUser?.total_disk_usage ?? 0;
-            }
-        },
-        totalUsageString() {
-            const total = this.currentUser?.total_disk_usage ?? 0;
-            return bytesToString(total, true);
-        },
-        title() {
-            let details = "";
-            if (this.isAnonymous) {
-                details = this.l("Log in for details.");
-            } else {
-                details = this.l("Click for details.");
-            }
+const totalUsageString = computed(() => {
+    const total = currentUser.value?.total_disk_usage ?? 0;
+    return bytesToString(total, true);
+});
 
-            if (this.hasQuota) {
-                return this.usingString + " " + this.totalUsageString + ". " + details;
-            } else {
-                return details;
-            }
-        },
-        variant() {
-            if (!this.hasQuota || this.usage < 80) {
-                return "success";
-            } else if (this.usage < 95) {
-                return "warning";
-            } else {
-                return "danger";
-            }
-        },
-    },
-};
+const usage = computed(() => {
+    if (hasQuota.value) {
+        return currentUser.value?.quota_percent ?? 0;
+    }
+    return currentUser.value?.total_disk_usage ?? 0;
+});
+
+const quotaLink = computed(() => (isAnonymous.value ? "/login/start" : "/storage"));
+
+const quotaTitle = computed(() =>
+    isAnonymous.value ? "Login to Access Storage Details" : "Storage and Usage Details"
+);
+
+const variant = computed(() => {
+    if (!hasQuota.value || usage.value < 80) {
+        return "success";
+    } else if (usage.value < 95) {
+        return "warning";
+    }
+    return "danger";
+});
 </script>
 
+<template>
+    <div v-b-tooltip.hover.bottom class="quota-meter d-flex align-items-center" :title="quotaTitle">
+        <BLink class="quota-progress" :to="quotaLink" data-description="storage dashboard link">
+            <BProgress :max="100">
+                <BProgressBar aria-label="Quota usage" :value="usage" :variant="variant" />
+            </BProgress>
+            <span>
+                <span v-localize>Using</span>
+                <span v-if="hasQuota">
+                    <span>{{ usage.toFixed(0) }}%</span>
+                    <span v-if="quotaLimit !== 0">of {{ quotaLimit }}</span>
+                </span>
+                <span v-else>{{ totalUsageString }}</span>
+            </span>
+        </BLink>
+    </div>
+</template>
+
 <style lang="scss" scoped>
-.quote-container {
+.quota-meter {
     position: relative;
     height: 100%;
+    margin-left: 0.5rem;
     margin-right: 0.5rem;
-}
-.quota-text {
-    @extend .quote-container;
-    background: var(--masthead-link-color);
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-    a {
-        color: var(--masthead-text-color);
-        text-decoration: none;
-    }
-}
-.quota-meter {
-    @extend .quote-container;
     .quota-progress {
-        width: 100px;
+        width: 12rem;
         height: 1.4em;
         position: relative;
         & > * {
@@ -116,8 +79,6 @@ export default {
             width: 100%;
             height: 100%;
             text-align: center;
-        }
-        & > span {
             line-height: 1.4em;
             pointer-events: none;
         }
diff --git a/client/src/components/Panels/SettingsPanel.vue b/client/src/components/Panels/SettingsPanel.vue
index b48829721792..10d38496bd2a 100644
--- a/client/src/components/Panels/SettingsPanel.vue
+++ b/client/src/components/Panels/SettingsPanel.vue
@@ -13,9 +13,8 @@ function onQuery(newQuery: string) {
 </script>
 
 <template>
-    <ActivityPanel title="Settings" go-to-all-title="User Preferences" href="/user">
+    <ActivityPanel title="Additional Activities">
         <template v-slot:header>
-            <h3>Customize Activity Bar</h3>
             <DelayedInput :delay="100" placeholder="Search activities" @change="onQuery" />
         </template>
         <ActivitySettings :query="query" />
diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index 33e430d1a1a8..0268d65bad8e 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -248,6 +248,9 @@ export default {
         canMutateHistory() {
             return this.currentHistory && canMutateHistory(this.currentHistory);
         },
+        runButtonTitle() {
+            return "Run Tool";
+        },
     },
     watch: {
         currentHistoryId() {
diff --git a/client/src/components/Workflow/Editor/Actions/stepActions.ts b/client/src/components/Workflow/Editor/Actions/stepActions.ts
index d8035b0ea171..9e29437040ab 100644
--- a/client/src/components/Workflow/Editor/Actions/stepActions.ts
+++ b/client/src/components/Workflow/Editor/Actions/stepActions.ts
@@ -54,6 +54,22 @@ export class LazyMutateStepAction<K extends keyof Step> extends LazyUndoRedoActi
     }
 }
 
+function onLabelSet(
+    classInstance: LazySetLabelAction | LazySetOutputLabelAction,
+    from: string | null | undefined,
+    to: string | null | undefined
+) {
+    const markdown = classInstance.stateStore.report.markdown ?? "";
+    const newMarkdown = replaceLabel(markdown, classInstance.labelType, from, to);
+
+    if (markdown !== newMarkdown) {
+        classInstance.stateStore.report.markdown = newMarkdown;
+        classInstance.success(
+            `${classInstance.labelTypeTitle} label updated from "${from}" to "${to}" in workflow report.`
+        );
+    }
+}
+
 export class LazySetLabelAction extends LazyMutateStepAction<"label"> {
     labelType: "input" | "step";
     labelTypeTitle: "Input" | "Step";
@@ -80,24 +96,13 @@ export class LazySetLabelAction extends LazyMutateStepAction<"label"> {
         this.success = useToast().success;
     }
 
-    private toast(from: string, to: string) {
-        this.success(`${this.labelTypeTitle} label updated from "${from}" to "${to}" in workflow report.`);
-    }
-
     run() {
-        const markdown = this.stateStore.report.markdown ?? "";
-        const newMarkdown = replaceLabel(markdown, this.labelType, this.fromValue as string, this.toValue as string);
-        this.stateStore.report.markdown = newMarkdown;
-        this.toast(this.fromValue ?? "", this.toValue ?? "");
+        onLabelSet(this, this.fromValue, this.toValue);
     }
 
     undo() {
         super.undo();
-
-        const markdown = this.stateStore.report.markdown ?? "";
-        const newMarkdown = replaceLabel(markdown, this.labelType, this.toValue as string, this.fromValue as string);
-        this.stateStore.report.markdown = newMarkdown;
-        this.toast(this.toValue ?? "", this.fromValue ?? "");
+        onLabelSet(this, this.toValue, this.fromValue);
     }
 
     redo() {
@@ -111,6 +116,8 @@ export class LazySetOutputLabelAction extends LazyMutateStepAction<"workflow_out
     fromLabel;
     toLabel;
     stateStore;
+    labelType = "output" as const;
+    labelTypeTitle = "Output" as const;
 
     constructor(
         stepStore: WorkflowStepStore,
@@ -132,25 +139,13 @@ export class LazySetOutputLabelAction extends LazyMutateStepAction<"workflow_out
         this.success = useToast().success;
     }
 
-    private toast(from: string, to: string) {
-        this.success(`Output label updated from "${from}" to "${to}" in workflow report.`);
-    }
-
     run() {
-        const markdown = this.stateStore.report.markdown ?? "";
-        const newMarkdown = replaceLabel(markdown, "output", this.fromLabel, this.toLabel);
-        this.stateStore.report.markdown = newMarkdown;
-        this.toast(this.fromLabel ?? "", this.toLabel ?? "");
+        onLabelSet(this, this.fromLabel, this.toLabel);
     }
 
     undo() {
         super.undo();
-
-        const markdown = this.stateStore.report.markdown ?? "";
-        const newMarkdown = replaceLabel(markdown, "output", this.toLabel, this.fromLabel);
-        this.stateStore.report.markdown = newMarkdown;
-
-        this.toast(this.toLabel ?? "", this.fromLabel ?? "");
+        onLabelSet(this, this.toLabel, this.fromLabel);
     }
 
     redo() {
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 6025c523050c..71983b2421d0 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -355,6 +355,15 @@ export default {
         }
 
         const tags = ref([]);
+
+        watch(
+            () => props.workflowTags,
+            (newTags) => {
+                tags.value = [...newTags];
+            },
+            { immediate: true }
+        );
+
         const setTagsHandler = new SetValueActionHandler(
             undoRedoStore,
             (value) => (tags.value = structuredClone(value)),
@@ -792,12 +801,9 @@ export default {
             this.report.markdown = markdown;
         },
         onRun() {
-            const runUrl = `/workflows/run?id=${this.id}${
-                this.version !== undefined ? `&version=${this.version}` : ""
-            }`;
-            this.onNavigate(runUrl);
+            this.onNavigate(`/workflows/run?id=${this.id}`, false, false, true);
         },
-        async onNavigate(url, forceSave = false, ignoreChanges = false) {
+        async onNavigate(url, forceSave = false, ignoreChanges = false, appendVersion = false) {
             if (this.isNewTempWorkflow) {
                 await this.onCreate();
             } else if (this.hasChanges && !forceSave && !ignoreChanges) {
@@ -810,6 +816,9 @@ export default {
                 await this.onSave();
             }
 
+            if (appendVersion && this.version !== undefined) {
+                url += `&version=${this.version}`;
+            }
             this.hasChanges = false;
             await nextTick();
             this.$router.push(url);
diff --git a/client/src/components/Workflow/Editor/SaveChangesModal.vue b/client/src/components/Workflow/Editor/SaveChangesModal.vue
index 9a2b5bbda2d0..921fa76a4b9e 100644
--- a/client/src/components/Workflow/Editor/SaveChangesModal.vue
+++ b/client/src/components/Workflow/Editor/SaveChangesModal.vue
@@ -24,7 +24,7 @@ const busy = ref(false);
 
 const emit = defineEmits<{
     /** Proceed with or without saving the changes */
-    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean): void;
+    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean, appendVersion: boolean): void;
     /** Update the nav URL prop */
     (e: "update:nav-url", url: string): void;
     /** Update the show modal boolean prop */
@@ -49,13 +49,13 @@ function closeModal() {
 
 function dontSave() {
     busy.value = true;
-    emit("on-proceed", props.navUrl, false, true);
+    emit("on-proceed", props.navUrl, false, true, true);
 }
 
 function saveChanges() {
     busy.value = true;
     closeModal();
-    emit("on-proceed", props.navUrl, true, false);
+    emit("on-proceed", props.navUrl, true, false, true);
 }
 </script>
 
diff --git a/client/src/components/Workflow/List/WorkflowActions.vue b/client/src/components/Workflow/List/WorkflowActions.vue
new file mode 100644
index 000000000000..a6acda9a75f6
--- /dev/null
+++ b/client/src/components/Workflow/List/WorkflowActions.vue
@@ -0,0 +1,202 @@
+<script setup lang="ts">
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faStar as farStar } from "@fortawesome/free-regular-svg-icons";
+import {
+    faCaretDown,
+    faExternalLinkAlt,
+    faEye,
+    faFileExport,
+    faSpinner,
+    faStar,
+    faTrash,
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { BButton, BButtonGroup } from "bootstrap-vue";
+import { storeToRefs } from "pinia";
+import { computed, ref } from "vue";
+
+import { getGalaxyInstance } from "@/app";
+import { deleteWorkflow, updateWorkflow } from "@/components/Workflow/workflows.services";
+import { useConfirmDialog } from "@/composables/confirmDialog";
+import { Toast } from "@/composables/toast";
+import { useUserStore } from "@/stores/userStore";
+
+library.add(farStar, faCaretDown, faExternalLinkAlt, faEye, faFileExport, faSpinner, faStar, faTrash);
+
+interface Props {
+    workflow: any;
+    published?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    published: false,
+});
+
+const emit = defineEmits<{
+    (e: "refreshList", a?: boolean): void;
+}>();
+
+const userStore = useUserStore();
+const { isAnonymous } = storeToRefs(userStore);
+
+const { confirm } = useConfirmDialog();
+
+const bookmarkLoading = ref(false);
+
+const shared = computed(() => {
+    if (userStore.currentUser) {
+        return userStore.currentUser.username !== props.workflow.owner;
+    } else {
+        return false;
+    }
+});
+const sourceType = computed(() => {
+    if (props.workflow.source_metadata?.url) {
+        return "url";
+    } else if (props.workflow.source_metadata?.trs_server) {
+        return `trs_${props.workflow.source_metadata?.trs_server}`;
+    } else {
+        return "";
+    }
+});
+
+async function onToggleBookmark(checked: boolean) {
+    try {
+        bookmarkLoading.value = true;
+
+        await updateWorkflow(props.workflow.id, {
+            show_in_tool_panel: checked,
+        });
+
+        Toast.info(`Workflow ${checked ? "added to" : "removed from"} bookmarks`);
+
+        if (checked) {
+            getGalaxyInstance().config.stored_workflow_menu_entries.push({
+                id: props.workflow.id,
+                name: props.workflow.name,
+            });
+        } else {
+            const indexToRemove = getGalaxyInstance().config.stored_workflow_menu_entries.findIndex(
+                (w: any) => w.id === props.workflow.id
+            );
+            getGalaxyInstance().config.stored_workflow_menu_entries.splice(indexToRemove, 1);
+        }
+    } catch (error) {
+        Toast.error("Failed to update workflow bookmark status");
+    } finally {
+        emit("refreshList", true);
+        bookmarkLoading.value = false;
+    }
+}
+
+async function onDelete() {
+    const confirmed = await confirm("Are you sure you want to delete this workflow?", {
+        title: "Delete workflow",
+        okTitle: "Delete",
+        okVariant: "danger",
+    });
+
+    if (confirmed) {
+        await deleteWorkflow(props.workflow.id);
+        emit("refreshList", true);
+        Toast.info("Workflow deleted");
+    }
+}
+</script>
+
+<template>
+    <div class="workflow-actions">
+        <BButtonGroup>
+            <BButton
+                v-if="!props.workflow.deleted && !props.workflow.show_in_tool_panel"
+                v-b-tooltip.hover.noninteractive
+                class="workflow-bookmark-button-add inline-icon-button"
+                variant="link"
+                title="Add to bookmarks"
+                tooltip="Add to bookmarks. This workflow will appear in the left tool panel."
+                size="sm"
+                @click="onToggleBookmark(true)">
+                <FontAwesomeIcon v-if="!bookmarkLoading" :icon="farStar" fixed-width />
+                <FontAwesomeIcon v-else :icon="faSpinner" spin fixed-width />
+            </BButton>
+            <BButton
+                v-else-if="!props.workflow.deleted && props.workflow.show_in_tool_panel"
+                v-b-tooltip.hover.noninteractive
+                class="workflow-bookmark-button-remove inline-icon-button"
+                variant="link"
+                title="Remove bookmark"
+                size="sm"
+                @click="onToggleBookmark(false)">
+                <FontAwesomeIcon v-if="!bookmarkLoading" :icon="faStar" fixed-width />
+                <FontAwesomeIcon v-else :icon="faSpinner" spin fixed-width />
+            </BButton>
+
+            <BDropdown
+                v-b-tooltip.top.noninteractive
+                :data-workflow-actions-dropdown="workflow.id"
+                right
+                no-caret
+                class="workflow-actions-dropdown"
+                title="Workflow actions"
+                toggle-class="inline-icon-button"
+                variant="link">
+                <template v-slot:button-content>
+                    <FontAwesomeIcon :icon="faCaretDown" fixed-width />
+                </template>
+
+                <BDropdownItem
+                    v-if="!isAnonymous && !shared && !props.workflow.deleted"
+                    class="workflow-delete-button"
+                    title="Delete workflow"
+                    size="sm"
+                    variant="link"
+                    @click="onDelete">
+                    <FontAwesomeIcon :icon="faTrash" fixed-width />
+                    <span>Delete</span>
+                </BDropdownItem>
+
+                <BDropdownItem
+                    v-if="sourceType.includes('trs')"
+                    class="source-trs-button"
+                    :title="`View on ${props.workflow.source_metadata?.trs_server}`"
+                    size="sm"
+                    variant="link"
+                    :href="`https://dockstore.org/workflows${props.workflow?.source_metadata?.trs_tool_id?.slice(9)}`"
+                    target="_blank">
+                    <FontAwesomeIcon :icon="faExternalLinkAlt" fixed-width />
+                    <span>View on Dockstore</span>
+                </BDropdownItem>
+
+                <BDropdownItem
+                    v-if="sourceType == 'url'"
+                    class="workflow-view-external-link-button"
+                    title="View external link"
+                    size="sm"
+                    variant="link"
+                    :href="props.workflow.source_metadata?.url"
+                    target="_blank">
+                    <FontAwesomeIcon :icon="faExternalLinkAlt" fixed-width />
+                    <span>View external link</span>
+                </BDropdownItem>
+
+                <BDropdownItem
+                    v-if="!props.workflow.deleted"
+                    class="workflow-export-button"
+                    title="Export"
+                    size="sm"
+                    variant="link"
+                    :to="`/workflows/export?id=${props.workflow.id}`">
+                    <FontAwesomeIcon :icon="faFileExport" fixed-width />
+                    <span>Export</span>
+                </BDropdownItem>
+            </BDropdown>
+        </BButtonGroup>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.workflow-actions {
+    display: flex;
+    align-items: center;
+}
+</style>
diff --git a/client/src/components/Workflow/WorkflowActionsExtend.vue b/client/src/components/Workflow/List/WorkflowActionsExtend.vue
similarity index 95%
rename from client/src/components/Workflow/WorkflowActionsExtend.vue
rename to client/src/components/Workflow/List/WorkflowActionsExtend.vue
index 98d0484e45ca..6968cc745ef7 100644
--- a/client/src/components/Workflow/WorkflowActionsExtend.vue
+++ b/client/src/components/Workflow/List/WorkflowActionsExtend.vue
@@ -18,13 +18,11 @@ library.add(faCopy, faDownload, faLink, faShareAlt, faTrashRestore);
 
 interface Props {
     workflow: any;
-    menu?: boolean;
     published?: boolean;
-    buttonSize?: "sm" | "md" | "lg";
 }
 
 const props = withDefaults(defineProps<Props>(), {
-    buttonSize: "sm",
+    published: false,
 });
 
 const emit = defineEmits<{
@@ -87,7 +85,7 @@ function onCopyPublicLink() {
                 v-if="workflow.published && !workflow.deleted"
                 id="workflow-copy-public-button"
                 v-b-tooltip.hover.noninteractive
-                :size="buttonSize"
+                size="sm"
                 title="Copy link to workflow"
                 variant="outline-primary"
                 @click="onCopyPublicLink">
@@ -99,7 +97,7 @@ function onCopyPublicLink() {
                 v-if="!isAnonymous && !shared && !workflow.deleted"
                 id="workflow-copy-button"
                 v-b-tooltip.hover.noninteractive
-                :size="buttonSize"
+                size="sm"
                 title="Copy"
                 variant="outline-primary"
                 @click="onCopy">
@@ -111,7 +109,7 @@ function onCopyPublicLink() {
                 v-if="!workflow.deleted"
                 id="workflow-download-button"
                 v-b-tooltip.hover.noninteractive
-                :size="buttonSize"
+                size="sm"
                 title="Download workflow in .ga format"
                 variant="outline-primary"
                 :href="downloadUrl">
@@ -123,7 +121,7 @@ function onCopyPublicLink() {
                 v-if="!isAnonymous && !shared && !workflow.deleted"
                 id="workflow-share-button"
                 v-b-tooltip.hover.noninteractive
-                :size="buttonSize"
+                size="sm"
                 title="Share"
                 variant="outline-primary"
                 :to="`/workflows/sharing?id=${workflow.id}`">
@@ -135,7 +133,7 @@ function onCopyPublicLink() {
                 v-if="workflow.deleted"
                 id="restore-button"
                 v-b-tooltip.hover.noninteractive
-                :size="buttonSize"
+                size="sm"
                 title="Restore"
                 variant="outline-primary"
                 @click="onRestore">
diff --git a/client/src/components/Workflow/WorkflowCard.vue b/client/src/components/Workflow/List/WorkflowCard.vue
similarity index 93%
rename from client/src/components/Workflow/WorkflowCard.vue
rename to client/src/components/Workflow/List/WorkflowCard.vue
index f0df64bcebd8..076ec2c271e6 100644
--- a/client/src/components/Workflow/WorkflowCard.vue
+++ b/client/src/components/Workflow/List/WorkflowCard.vue
@@ -2,7 +2,7 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faEdit, faEye, faPen, faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { BButton } from "bootstrap-vue";
+import { BButton, BLink } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
 import { computed, ref } from "vue";
 
@@ -13,12 +13,12 @@ import { useUserStore } from "@/stores/userStore";
 import AsyncButton from "@/components/Common/AsyncButton.vue";
 import TextSummary from "@/components/Common/TextSummary.vue";
 import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
+import WorkflowActions from "@/components/Workflow/List/WorkflowActions.vue";
+import WorkflowActionsExtend from "@/components/Workflow/List/WorkflowActionsExtend.vue";
+import WorkflowIndicators from "@/components/Workflow/List/WorkflowIndicators.vue";
+import WorkflowRename from "@/components/Workflow/List/WorkflowRename.vue";
 import WorkflowPublished from "@/components/Workflow/Published/WorkflowPublished.vue";
-import WorkflowActions from "@/components/Workflow/WorkflowActions.vue";
-import WorkflowActionsExtend from "@/components/Workflow/WorkflowActionsExtend.vue";
-import WorkflowIndicators from "@/components/Workflow/WorkflowIndicators.vue";
 import WorkflowInvocationsCount from "@/components/Workflow/WorkflowInvocationsCount.vue";
-import WorkflowRename from "@/components/Workflow/WorkflowRename.vue";
 import WorkflowRunButton from "@/components/Workflow/WorkflowRunButton.vue";
 
 library.add(faEdit, faEye, faPen, faUpload);
@@ -141,7 +141,13 @@ async function onTagClick(tag: string) {
                 </div>
 
                 <span class="workflow-name font-weight-bold">
-                    {{ workflow.name }}
+                    <BLink
+                        v-b-tooltip.hover.noninteractive
+                        class="workflow-name-preview"
+                        title="Preview Workflow"
+                        @click.stop.prevent="toggleShowPreview(true)"
+                        >{{ workflow.name }}</BLink
+                    >
                     <BButton
                         v-if="!shared && !workflow.deleted"
                         v-b-tooltip.hover.noninteractive
diff --git a/client/src/components/Workflow/WorkflowFilters.js b/client/src/components/Workflow/List/WorkflowFilters.js
similarity index 100%
rename from client/src/components/Workflow/WorkflowFilters.js
rename to client/src/components/Workflow/List/WorkflowFilters.js
diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/List/WorkflowIndicators.vue
similarity index 100%
rename from client/src/components/Workflow/WorkflowIndicators.vue
rename to client/src/components/Workflow/List/WorkflowIndicators.vue
diff --git a/client/src/components/Workflow/WorkflowList.test.ts b/client/src/components/Workflow/List/WorkflowList.test.ts
similarity index 98%
rename from client/src/components/Workflow/WorkflowList.test.ts
rename to client/src/components/Workflow/List/WorkflowList.test.ts
index 6d98ef33714d..b4b71d02f185 100644
--- a/client/src/components/Workflow/WorkflowList.test.ts
+++ b/client/src/components/Workflow/List/WorkflowList.test.ts
@@ -7,7 +7,7 @@ import { setActivePinia } from "pinia";
 import { mockFetcher } from "@/api/schema/__mocks__";
 import { useUserStore } from "@/stores/userStore";
 
-import { generateRandomWorkflowList } from "./testUtils";
+import { generateRandomWorkflowList } from "../testUtils";
 
 import WorkflowList from "./WorkflowList.vue";
 
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/List/WorkflowList.vue
similarity index 98%
rename from client/src/components/Workflow/WorkflowList.vue
rename to client/src/components/Workflow/List/WorkflowList.vue
index 3cbda017cc01..b730a12f002c 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/List/WorkflowList.vue
@@ -7,19 +7,18 @@ import { filter } from "underscore";
 import { computed, onMounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
+import { helpHtml, WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters";
 import { loadWorkflows } from "@/components/Workflow/workflows.services";
 import { Toast } from "@/composables/toast";
 import { useUserStore } from "@/stores/userStore";
 
-import { helpHtml, WorkflowFilters } from "./WorkflowFilters";
-
 import FilterMenu from "@/components/Common/FilterMenu.vue";
 import Heading from "@/components/Common/Heading.vue";
 import ListHeader from "@/components/Common/ListHeader.vue";
 import LoginRequired from "@/components/Common/LoginRequired.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
-import WorkflowCard from "@/components/Workflow/WorkflowCard.vue";
-import WorkflowListActions from "@/components/Workflow/WorkflowListActions.vue";
+import WorkflowCard from "@/components/Workflow/List/WorkflowCard.vue";
+import WorkflowListActions from "@/components/Workflow/List/WorkflowListActions.vue";
 
 library.add(faStar, faTrash);
 
diff --git a/client/src/components/Workflow/WorkflowListActions.vue b/client/src/components/Workflow/List/WorkflowListActions.vue
similarity index 100%
rename from client/src/components/Workflow/WorkflowListActions.vue
rename to client/src/components/Workflow/List/WorkflowListActions.vue
diff --git a/client/src/components/Workflow/WorkflowRename.vue b/client/src/components/Workflow/List/WorkflowRename.vue
similarity index 100%
rename from client/src/components/Workflow/WorkflowRename.vue
rename to client/src/components/Workflow/List/WorkflowRename.vue
diff --git a/client/src/components/Workflow/WorkflowActions.vue b/client/src/components/Workflow/WorkflowActions.vue
deleted file mode 100644
index c7422119e868..000000000000
--- a/client/src/components/Workflow/WorkflowActions.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<script setup lang="ts">
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faStar as farStar } from "@fortawesome/free-regular-svg-icons";
-import {
-    faCaretDown,
-    faExternalLinkAlt,
-    faEye,
-    faFileExport,
-    faStar,
-    faTrash,
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { BButton } from "bootstrap-vue";
-import { storeToRefs } from "pinia";
-import { computed, type ComputedRef } from "vue";
-
-import { getGalaxyInstance } from "@/app";
-import { deleteWorkflow, updateWorkflow } from "@/components/Workflow/workflows.services";
-import { useConfirmDialog } from "@/composables/confirmDialog";
-import { Toast } from "@/composables/toast";
-import { useUserStore } from "@/stores/userStore";
-
-import type { ColorVariant } from "../Common";
-
-import AsyncButton from "@/components/Common/AsyncButton.vue";
-
-library.add(faCaretDown, faExternalLinkAlt, faEye, faFileExport, farStar, faStar, faTrash);
-
-interface Props {
-    workflow: any;
-    menu?: boolean;
-    published?: boolean;
-    buttonSize?: "sm" | "md" | "lg";
-}
-
-type BaseAction = {
-    condition?: boolean;
-    class?: string;
-    title: string;
-    tooltip?: string;
-    icon: any;
-    href?: string;
-    target?: "_blank";
-    size: "sm" | "md" | "lg";
-    component: "async" | "button";
-    variant: ColorVariant | "link";
-    onClick?: (e?: MouseEvent | KeyboardEvent) => void;
-};
-
-interface AAction extends BaseAction {
-    component: "async";
-    action: () => Promise<void>;
-}
-
-interface BAction extends BaseAction {
-    component: "button";
-    to?: string;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    buttonSize: "sm",
-});
-
-const emit = defineEmits<{
-    (e: "refreshList", a?: boolean): void;
-    (e: "toggleShowPreview", a?: boolean): void;
-}>();
-
-const userStore = useUserStore();
-const { isAnonymous } = storeToRefs(userStore);
-const { confirm } = useConfirmDialog();
-
-const shared = computed(() => {
-    if (userStore.currentUser) {
-        return userStore.currentUser.username !== props.workflow.owner;
-    } else {
-        return false;
-    }
-});
-const sourceType = computed(() => {
-    if (props.workflow.source_metadata?.url) {
-        return "url";
-    } else if (props.workflow.source_metadata?.trs_server) {
-        return `trs_${props.workflow.source_metadata?.trs_server}`;
-    } else {
-        return "";
-    }
-});
-
-async function onToggleBookmark(checked: boolean) {
-    await updateWorkflow(props.workflow.id, {
-        show_in_tool_panel: checked,
-    });
-
-    emit("refreshList", true);
-
-    Toast.info(`Workflow ${checked ? "added to" : "removed from"} bookmarks`);
-
-    if (checked) {
-        getGalaxyInstance().config.stored_workflow_menu_entries.push({
-            id: props.workflow.id,
-            name: props.workflow.name,
-        });
-    } else {
-        const indexToRemove = getGalaxyInstance().config.stored_workflow_menu_entries.findIndex(
-            (w: any) => w.id === props.workflow.id
-        );
-        getGalaxyInstance().config.stored_workflow_menu_entries.splice(indexToRemove, 1);
-    }
-}
-
-async function onDelete() {
-    const confirmed = await confirm("Are you sure you want to delete this workflow?", {
-        title: "Delete workflow",
-        okTitle: "Delete",
-        okVariant: "danger",
-    });
-
-    if (confirmed) {
-        await deleteWorkflow(props.workflow.id);
-        emit("refreshList", true);
-        Toast.info("Workflow deleted");
-    }
-}
-
-const actions: ComputedRef<(AAction | BAction)[]> = computed(() => {
-    return [
-        {
-            condition: !props.workflow.deleted && !props.workflow.show_in_tool_panel,
-            class: "workflow-bookmark-button-add",
-            component: "async",
-            title: "Add bookmarks",
-            tooltip: "Add to bookmarks. This workflow will appear in the left tool panel.",
-            icon: farStar,
-            size: props.buttonSize,
-            variant: "link",
-            action: () => onToggleBookmark(true),
-        },
-        {
-            condition: !props.workflow.deleted && props.workflow.show_in_tool_panel,
-            class: "workflow-bookmark-button-remove",
-            component: "async",
-            title: "Remove bookmark",
-            tooltip: "Remove bookmark",
-            icon: faStar,
-            size: props.buttonSize,
-            variant: "link",
-            action: () => onToggleBookmark(false),
-        },
-        {
-            condition: true,
-            class: "workflow-view-button",
-            component: "button",
-            title: "View workflow",
-            tooltip: "View workflow",
-            icon: faEye,
-            size: props.buttonSize,
-            variant: "link",
-            onClick: () => emit("toggleShowPreview", true),
-        },
-    ];
-});
-
-const menuActions: ComputedRef<BAction[]> = computed(() => {
-    return [
-        {
-            condition: !isAnonymous.value && !shared.value && !props.workflow.deleted,
-            class: "workflow-delete-button",
-            component: "button",
-            title: "Delete workflow",
-            tooltip: "Delete workflow",
-            icon: faTrash,
-            size: props.buttonSize,
-            variant: "link",
-            onClick: () => onDelete(),
-        },
-        {
-            condition: sourceType.value.includes("trs"),
-            class: "source-trs-button",
-            component: "button",
-            title: `View on ${props.workflow.source_metadata?.trs_server}`,
-            href: `https://dockstore.org/workflows${props.workflow?.source_metadata?.trs_tool_id?.slice(9)}`,
-            target: "_blank",
-            icon: faExternalLinkAlt,
-            size: props.buttonSize,
-            variant: "link",
-        },
-        {
-            condition: sourceType.value == "url",
-            class: "workflow-view-external-link-button",
-            component: "button",
-            title: "View external link",
-            href: props.workflow.source_metadata?.url,
-            target: "_blank",
-            icon: faExternalLinkAlt,
-            size: props.buttonSize,
-            variant: "link",
-        },
-        {
-            condition: !props.workflow.deleted,
-            class: "workflow-export-button",
-            component: "button",
-            title: "Export",
-            icon: faFileExport,
-            size: props.buttonSize,
-            variant: "link",
-            to: `/workflows/export?id=${props.workflow.id}`,
-        },
-    ];
-});
-</script>
-
-<template>
-    <div class="workflow-actions">
-        <div v-for="action in actions" :key="action.class">
-            <AsyncButton
-                v-if="action.condition && action.component === 'async'"
-                v-b-tooltip.hover.noninteractive
-                :class="action.class"
-                class="inline-icon-button mr-1"
-                :variant="action.variant"
-                :size="action.size"
-                :title="action.tooltip"
-                :icon="action.icon"
-                :action="action.action" />
-
-            <BButton
-                v-else-if="action.condition && action.component === 'button'"
-                v-b-tooltip.hover.noninteractive
-                :class="action.class"
-                class="inline-icon-button mr-1"
-                :variant="action.variant"
-                :size="action.size"
-                :title="action.tooltip"
-                :href="action.href"
-                :to="action.to"
-                @click="action.onClick">
-                <FontAwesomeIcon :icon="action.icon" fixed-width />
-            </BButton>
-        </div>
-
-        <BDropdown
-            v-b-tooltip.top.noninteractive
-            :data-workflow-actions-dropdown="workflow.id"
-            right
-            no-caret
-            class="workflow-actions-dropdown"
-            toggle-class="inline-icon-button"
-            title="Workflow actions"
-            variant="link">
-            <template v-slot:button-content>
-                <FontAwesomeIcon :icon="faCaretDown" fixed-width />
-            </template>
-
-            <BDropdownItem
-                v-for="action in menuActions.filter((a) => a.condition).reverse()"
-                :key="action.class"
-                :class="action.class"
-                :href="action.href"
-                :title="action.title"
-                :target="action.target"
-                :to="action.to"
-                @click="action.onClick?.()">
-                <FontAwesomeIcon :icon="action.icon" fixed-width />
-                <span>{{ action.title }}</span>
-            </BDropdownItem>
-        </BDropdown>
-    </div>
-</template>
-
-<style scoped lang="scss">
-.workflow-actions {
-    display: flex;
-    align-items: center;
-}
-</style>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index c71970e3691c..603c51236c34 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -18,13 +18,13 @@ import { isTerminal, jobCount, runningCount } from "./util";
 import Heading from "../Common/Heading.vue";
 import SwitchToHistoryLink from "../History/SwitchToHistoryLink.vue";
 import UtcDate from "../UtcDate.vue";
-import InvocationReport from "../Workflow/InvocationReport.vue";
-import WorkflowInvocationsCount from "../Workflow/WorkflowInvocationsCount.vue";
-import WorkflowRunButton from "../Workflow/WorkflowRunButton.vue";
 import WorkflowInvocationExportOptions from "./WorkflowInvocationExportOptions.vue";
 import WorkflowInvocationInputOutputTabs from "./WorkflowInvocationInputOutputTabs.vue";
 import WorkflowInvocationOverview from "./WorkflowInvocationOverview.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
+import InvocationReport from "@/components/Workflow/InvocationReport.vue";
+import WorkflowInvocationsCount from "@/components/Workflow/WorkflowInvocationsCount.vue";
+import WorkflowRunButton from "@/components/Workflow/WorkflowRunButton.vue";
 
 library.add(faArrowLeft, faClock, faEdit, faEye, faHdd, faPlay, faSitemap);
 
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
index 4678418e6f5d..243c44d428d1 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
@@ -74,7 +74,7 @@
                                 </details>
                                 <ParameterStep
                                     v-else-if="workflowStepType == 'parameter_input'"
-                                    :parameters="[invocation.input_step_parameters[stepDetails.workflow_step_label]]" />
+                                    :parameters="[getParamInput(stepDetails)]" />
                                 <GenericHistoryItem
                                     v-else-if="
                                         isDataStep &&
@@ -209,6 +209,11 @@ export default {
                 this.fetchWorkflowForInstanceId(this.workflowStep.workflow_id);
             }
         },
+        getParamInput(stepDetails) {
+            return Object.values(this.invocation.input_step_parameters).find(
+                (param) => param.workflow_step_id === stepDetails.workflow_step_id
+            );
+        },
         showJob(id) {
             this.$emit("show-job", id);
         },
diff --git a/client/src/composables/useActivityAction.ts b/client/src/composables/useActivityAction.ts
new file mode 100644
index 000000000000..3dc1babc7f84
--- /dev/null
+++ b/client/src/composables/useActivityAction.ts
@@ -0,0 +1,21 @@
+import { useRouter } from "vue-router/composables";
+
+import { type Activity } from "@/stores/activityStore";
+import { useUserStore } from "@/stores/userStore";
+
+export function useActivityAction() {
+    const router = useRouter();
+    const userStore = useUserStore();
+    const executeActivity = (activity: Activity) => {
+        if (activity.panel) {
+            userStore.toggleSideBar(activity.id);
+        }
+        if (activity.to) {
+            router.push(activity.to);
+        }
+    };
+
+    return {
+        executeActivity,
+    };
+}
diff --git a/client/src/entry/analysis/App.vue b/client/src/entry/analysis/App.vue
index 9e178c8ad225..f87013e6cf45 100644
--- a/client/src/entry/analysis/App.vue
+++ b/client/src/entry/analysis/App.vue
@@ -10,9 +10,7 @@
                     :logo-url="config.logo_url"
                     :logo-src="theme?.['--masthead-logo-img'] ?? config.logo_src"
                     :logo-src-secondary="theme?.['--masthead-logo-img-secondary'] ?? config.logo_src_secondary"
-                    :tabs="tabs"
-                    :window-tab="windowTab"
-                    @open-url="openUrl" />
+                    :window-tab="windowTab" />
                 <Alert
                     v-if="config.message_box_visible && config.message_box_content"
                     id="messagebox"
@@ -55,12 +53,10 @@ import Toast from "components/Toast";
 import { setConfirmDialogComponentRef } from "composables/confirmDialog";
 import { setGlobalUploadModal } from "composables/globalUploadModal";
 import { setToastComponentRef } from "composables/toast";
-import { fetchMenu } from "entry/analysis/menu";
 import { WindowManager } from "layout/window-manager";
 import Modal from "mvc/ui/ui-modal";
 import { getAppRoot } from "onload";
 import { storeToRefs } from "pinia";
-import { withPrefix } from "utils/redirect";
 import { ref, watch } from "vue";
 
 import short from "@/components/plugins/short";
@@ -134,9 +130,6 @@ export default {
         };
     },
     computed: {
-        tabs() {
-            return fetchMenu(this.config);
-        },
         showMasthead() {
             const masthead = this.$route.query.hide_masthead;
             if (masthead !== undefined) {
@@ -199,18 +192,6 @@ export default {
             const notificationsStore = useNotificationsStore();
             notificationsStore.startWatchingNotifications();
         },
-        openUrl(urlObj) {
-            if (!urlObj.target) {
-                this.$router.push(urlObj.url);
-            } else {
-                const url = withPrefix(urlObj.url);
-                if (urlObj.target == "_blank") {
-                    window.open(url);
-                } else {
-                    window.location = url;
-                }
-            }
-        },
     },
 };
 </script>
diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js
deleted file mode 100644
index ec1de4f190af..000000000000
--- a/client/src/entry/analysis/menu.js
+++ /dev/null
@@ -1,255 +0,0 @@
-import { getGalaxyInstance } from "app";
-import _l from "utils/localization";
-import { userLogout } from "utils/logout";
-
-import { useUserStore } from "@/stores/userStore";
-
-export function fetchMenu(options = {}) {
-    const Galaxy = getGalaxyInstance();
-    const menu = [];
-    //
-    // Analyze data tab.
-    //
-    menu.push({
-        id: "analysis",
-        url: "/",
-        tooltip: _l("Tools and Current History"),
-        icon: "fa-home",
-        target: "_top",
-    });
-
-    //
-    // Workflow tab.
-    //
-    menu.push({
-        id: "workflow",
-        title: _l("Workflow"),
-        tooltip: _l("Chain tools into workflows"),
-        disabled: !Galaxy.user.id,
-        url: "/workflows/list",
-    });
-
-    //
-    // Visualization tab.
-    //
-    if (Galaxy.config.visualizations_visible) {
-        menu.push({
-            id: "visualization",
-            title: _l("Visualize"),
-            tooltip: _l("Visualize datasets"),
-            disabled: !Galaxy.user.id,
-            url: "/visualizations",
-        });
-    }
-
-    //
-    // 'Data' tab.
-    //
-    if (Galaxy.user.id) {
-        menu.push({
-            id: "resources",
-            title: _l("Data"),
-            url: "javascript:void(0)",
-            tooltip: _l("Access resources"),
-            menu: [
-                {
-                    title: _l("Data Libraries"),
-                    url: "/libraries",
-                },
-                {
-                    title: _l("Datasets"),
-                    url: "/datasets/list",
-                },
-                {
-                    title: _l("Histories"),
-                    url: "/histories/list",
-                },
-                {
-                    title: _l("Pages"),
-                    url: "/pages/list",
-                },
-                {
-                    title: _l("Visualizations"),
-                    url: "/visualizations/list",
-                },
-                {
-                    title: _l("Workflows"),
-                    url: "/workflows/list",
-                },
-                {
-                    title: _l("Workflow Invocations"),
-                    url: "/workflows/invocations",
-                },
-            ],
-        });
-    } else {
-        menu.push({
-            id: "resources",
-            title: _l("Data"),
-            url: "javascript:void(0)",
-            tooltip: _l("Access published resources"),
-            menu: [
-                {
-                    title: _l("Data Libraries"),
-                    url: "/libraries",
-                },
-                {
-                    title: _l("Histories"),
-                    url: "/histories/list_published",
-                },
-                {
-                    title: _l("Pages"),
-                    url: "/pages/list_published",
-                },
-                {
-                    title: _l("Visualizations"),
-                    url: "/visualizations/list_published",
-                },
-                {
-                    title: _l("Workflows"),
-                    url: "/workflows/list_published",
-                },
-            ],
-        });
-    }
-
-    //
-    // Admin.
-    //
-    if (Galaxy.user.get("is_admin")) {
-        menu.push({
-            id: "admin",
-            title: _l("Admin"),
-            url: "/admin",
-            tooltip: _l("Administer this Galaxy"),
-            cls: "admin-only",
-            onclick: () => {
-                const userStore = useUserStore();
-                userStore.toggleSideBar("admin");
-            },
-        });
-    }
-
-    //
-    // Help tab.
-    //
-    const helpTab = {
-        id: "help",
-        title: _l("Help"),
-        url: "javascript:void(0)",
-        tooltip: _l("Support, contact, and community"),
-        menu: [
-            {
-                title: _l("Galaxy Help"),
-                url: options.helpsite_url,
-                target: "_blank",
-                hidden: !options.helpsite_url,
-            },
-            {
-                title: _l("Support"),
-                url: options.support_url,
-                target: "_blank",
-                hidden: !options.support_url,
-            },
-            {
-                title: _l("Videos"),
-                url: options.screencasts_url,
-                target: "_blank",
-                hidden: !options.screencasts_url,
-            },
-            {
-                title: _l("Community Hub"),
-                url: options.wiki_url,
-                target: "_blank",
-                hidden: !options.wiki_url,
-            },
-            {
-                title: _l("How to Cite Galaxy"),
-                url: options.citation_url,
-                target: "_blank",
-            },
-            {
-                title: _l("Interactive Tours"),
-                url: "/tours",
-            },
-            {
-                title: _l("About"),
-                url: "/about",
-            },
-            {
-                title: _l("Terms and Conditions"),
-                url: options.terms_url,
-                target: "_blank",
-                hidden: !options.terms_url,
-            },
-        ],
-    };
-    menu.push(helpTab);
-
-    //
-    // User tab.
-    //
-    let userTab = {};
-    if (!Galaxy.user.id) {
-        if (options.allow_user_creation) {
-            userTab = {
-                id: "user",
-                title: _l("Log in or Register"),
-                cls: "loggedout-only",
-                url: "/login",
-                tooltip: _l("Log in or register a new account"),
-                target: "_top",
-            };
-        } else {
-            userTab = {
-                id: "user",
-                title: _l("Login"),
-                cls: "loggedout-only",
-                tooltip: _l("Login"),
-                url: "/login",
-                target: "_top",
-            };
-        }
-    } else {
-        userTab = {
-            id: "user",
-            title: _l("User"),
-            cls: "loggedin-only",
-            url: "javascript:void(0)",
-            tooltip: _l("Account and saved data"),
-            menu: [
-                {
-                    title: `${_l("Signed in as")} ${
-                        Galaxy.user.get("username") ? Galaxy.user.get("username") : Galaxy.user.get("email")
-                    }`,
-                    disabled: true,
-                },
-                { divider: true },
-            ],
-        };
-        if (Galaxy.config.interactivetools_enable) {
-            userTab.menu.push({
-                title: _l("Active Interactive Tools"),
-                url: "/interactivetool_entry_points/list",
-            });
-        }
-        if (Galaxy.config.enable_notification_system) {
-            userTab.menu.push({
-                title: _l("Notifications"),
-                url: "/user/notifications",
-            });
-        }
-        userTab.menu.push({ divider: true });
-        userTab.menu.push({
-            title: _l("Preferences"),
-            url: "/user",
-        });
-        userTab.menu.push({
-            title: _l("Sign Out"),
-            onclick: userLogout,
-            hidden: Galaxy.config.single_user,
-        });
-    }
-    menu.push(userTab);
-    return menu;
-}
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index 3b54544af220..811544520bd9 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -36,11 +36,11 @@ import HistoryInvocations from "components/Workflow/HistoryInvocations";
 import TrsImport from "components/Workflow/Import/TrsImport";
 import TrsSearch from "components/Workflow/Import/TrsSearch";
 import InvocationReport from "components/Workflow/InvocationReport";
+import WorkflowList from "components/Workflow/List/WorkflowList";
 import StoredWorkflowInvocations from "components/Workflow/StoredWorkflowInvocations";
 import WorkflowCreate from "components/Workflow/WorkflowCreate";
 import WorkflowExport from "components/Workflow/WorkflowExport";
 import WorkflowImport from "components/Workflow/WorkflowImport";
-import WorkflowList from "components/Workflow/WorkflowList";
 import Analysis from "entry/analysis/modules/Analysis";
 import CenterFrame from "entry/analysis/modules/CenterFrame";
 import Home from "entry/analysis/modules/Home";
@@ -88,10 +88,14 @@ Vue.use(VueRouter);
 patchRouterPush(VueRouter);
 
 // redirect anon users
-function redirectAnon() {
+function redirectAnon(redirect = "") {
     const Galaxy = getGalaxyInstance();
     if (!Galaxy.user || !Galaxy.user.id) {
-        return "/login/start";
+        if (redirect !== "") {
+            return redirect;
+        } else {
+            return "/login/start";
+        }
     }
 }
 
@@ -313,7 +317,7 @@ export function getRouter(Galaxy) {
                         props: {
                             activeList: "my",
                         },
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/histories/list_published"),
                     },
                     {
                         path: "histories/list_shared",
@@ -446,7 +450,7 @@ export function getRouter(Galaxy) {
                         props: {
                             activeList: "my",
                         },
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/pages/list_published"),
                     },
                     {
                         path: "pages/list_published",
@@ -622,13 +626,13 @@ export function getRouter(Galaxy) {
                         props: (route) => ({
                             invocationId: route.params.invocationId,
                             isFullPage: true,
-                            fromPanel: route.query.from_panel,
+                            fromPanel: Boolean(route.query.from_panel),
                         }),
                     },
                     {
                         path: "workflows/list",
                         component: WorkflowList,
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/workflows/list_published"),
                     },
                     {
                         path: "workflows/list_published",
diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts
index 2e8bf5b1c26e..f07e7ede7809 100644
--- a/client/src/stores/activitySetup.ts
+++ b/client/src/stores/activitySetup.ts
@@ -7,11 +7,12 @@ import { type EventData } from "@/stores/eventStore";
 export const Activities = [
     {
         anonymous: false,
-        description: "Displays currently active interactive tools (ITs), if these are enabled by the administrator.",
+        description: "Displays currently running interactive tools (ITs), if these are enabled by the administrator.",
         icon: "fa-laptop",
         id: "interactivetools",
         mutable: false,
         optional: false,
+        panel: false,
         title: "Interactive Tools",
         tooltip: "Show active interactive tools",
         to: "/interactivetool_entry_points/list",
@@ -24,6 +25,7 @@ export const Activities = [
         id: "upload",
         mutable: false,
         optional: false,
+        panel: false,
         title: "Upload",
         to: null,
         tooltip: "Download from URL or upload files from disk",
@@ -36,18 +38,20 @@ export const Activities = [
         id: "tools",
         mutable: false,
         optional: false,
+        panel: true,
         title: "Tools",
         to: null,
         tooltip: "Search and run tools",
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays a panel to search and access workflows.",
         icon: "sitemap",
         id: "workflows",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Workflows",
         to: "/workflows/list",
         tooltip: "Search and run workflows",
@@ -60,30 +64,33 @@ export const Activities = [
         id: "invocation",
         mutable: false,
         optional: true,
+        panel: true,
         title: "Workflow Invocations",
         tooltip: "Show all workflow runs",
         to: null,
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays the list of available visualizations.",
         icon: "chart-bar",
         id: "visualizations",
         mutable: false,
         optional: true,
+        panel: true,
         title: "Visualization",
         to: null,
         tooltip: "Visualize datasets",
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays the list of all histories.",
         icon: "fa-hdd",
         id: "histories",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Histories",
         tooltip: "Show all histories",
         to: "/histories/list",
@@ -96,6 +103,7 @@ export const Activities = [
         id: "multiview",
         mutable: false,
         optional: true,
+        panel: true,
         title: "History Multiview",
         tooltip: "Select histories to show in History Multiview",
         to: "/histories/view_multiple",
@@ -108,23 +116,38 @@ export const Activities = [
         id: "datasets",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Datasets",
         tooltip: "Show all datasets",
         to: "/datasets/list",
         visible: true,
     },
     {
-        anonymous: false,
-        description: "Display and create new Pages.",
+        anonymous: true,
+        description: "Display and create new pages.",
         icon: "fa-file-contract",
         id: "pages",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Pages",
         tooltip: "Show all pages",
         to: "/pages/list",
         visible: true,
     },
+    {
+        anonymous: false,
+        description: "Display Data Libraries with datasets available to all users.",
+        icon: "fa-database",
+        id: "libraries",
+        mutable: false,
+        optional: true,
+        panel: false,
+        title: "Libraries",
+        tooltip: "Access Data Libraries",
+        to: "/libraries",
+        visible: true,
+    },
 ];
 
 export function convertDropData(data: EventData): Activity | null {
@@ -136,6 +159,7 @@ export function convertDropData(data: EventData): Activity | null {
             id: `dataset-${data.id}`,
             mutable: true,
             optional: true,
+            panel: false,
             title: data.name as string,
             tooltip: "View your dataset",
             to: `/datasets/${data.id}/preview`,
@@ -150,6 +174,7 @@ export function convertDropData(data: EventData): Activity | null {
             id: `workflow-${data.id}`,
             mutable: true,
             optional: true,
+            panel: false,
             title: data.name as string,
             tooltip: data.name as string,
             to: `/workflows/run?id=${data.id}`,
diff --git a/client/src/stores/activityStore.test.ts b/client/src/stores/activityStore.test.ts
index 95f71bba9cd2..e5fee99c70ea 100644
--- a/client/src/stores/activityStore.test.ts
+++ b/client/src/stores/activityStore.test.ts
@@ -12,6 +12,7 @@ jest.mock("./activitySetup", () => ({
             id: "a-id",
             mutable: false,
             optional: false,
+            panel: true,
             title: "a-title",
             to: null,
             tooltip: "a-tooltip",
@@ -28,6 +29,7 @@ const newActivities = [
         id: "a-id",
         mutable: false,
         optional: false,
+        panel: true,
         title: "a-title",
         to: "a-to-new",
         tooltip: "a-tooltip-new",
@@ -40,6 +42,7 @@ const newActivities = [
         id: "b-id",
         mutable: true,
         optional: false,
+        panel: true,
         title: "b-title-new",
         to: "b-to-new",
         tooltip: "b-tooltip-new",
diff --git a/client/src/stores/activityStore.ts b/client/src/stores/activityStore.ts
index c7435f2ad10a..ed99ec67b2f7 100644
--- a/client/src/stores/activityStore.ts
+++ b/client/src/stores/activityStore.ts
@@ -22,6 +22,8 @@ export interface Activity {
     mutable: boolean;
     // indicate wether this activity can be disabled by the user
     optional: boolean;
+    // specifiy wether this activity utilizes the side panel
+    panel: boolean;
     // title to be displayed in the activity bar
     title: string;
     // route to be executed upon selecting the activity
diff --git a/client/src/stores/collectionElementsStore.test.ts b/client/src/stores/collectionElementsStore.test.ts
index af3096c49a4d..6af9a98f5d57 100644
--- a/client/src/stores/collectionElementsStore.test.ts
+++ b/client/src/stores/collectionElementsStore.test.ts
@@ -151,6 +151,7 @@ function mockElement(collectionId: string, i: number): DCESummary {
             history_id: "1",
             tags: [],
             accessible: true,
+            purged: false,
         },
     };
 }
diff --git a/client/src/style/scss/theme/blue.scss b/client/src/style/scss/theme/blue.scss
index 24c9f4972e8a..bd34431a210b 100644
--- a/client/src/style/scss/theme/blue.scss
+++ b/client/src/style/scss/theme/blue.scss
@@ -110,7 +110,7 @@ $input-color-placeholder: $text-muted;
 $body-bg: $white;
 
 // Masthead
-$masthead-height: 3rem;
+$masthead-height: 2.5rem;
 
 // Side panels
 $panel-bg-color: $brand-light;
diff --git a/client/src/utils/filterConversion.test.js b/client/src/utils/filterConversion.test.js
index cf3230e4d13d..6867c20c23f0 100644
--- a/client/src/utils/filterConversion.test.js
+++ b/client/src/utils/filterConversion.test.js
@@ -1,5 +1,5 @@
 import { HistoryFilters } from "components/History/HistoryFilters";
-import { WorkflowFilters } from "components/Workflow/WorkflowFilters";
+import { WorkflowFilters } from "components/Workflow/List/WorkflowFilters";
 
 describe("test filtering helpers to convert filters to filter text", () => {
     const MyWorkflowFilters = WorkflowFilters("my");
diff --git a/client/src/utils/mountVueComponent.js b/client/src/utils/mountVueComponent.js
index 9b06b76f4513..2e47c3cabbee 100644
--- a/client/src/utils/mountVueComponent.js
+++ b/client/src/utils/mountVueComponent.js
@@ -4,7 +4,7 @@
 
 import BootstrapVue from "bootstrap-vue";
 import { iconPlugin, localizationPlugin, vueRxShortcutPlugin } from "components/plugins";
-import { getActivePinia, PiniaVuePlugin } from "pinia";
+import { createPinia, getActivePinia, PiniaVuePlugin } from "pinia";
 import Vue from "vue";
 
 // Load Pinia
@@ -22,17 +22,25 @@ Vue.use(vueRxShortcutPlugin);
 // font-awesome svg icon registration/loading
 Vue.use(iconPlugin);
 
-export const mountVueComponent = (ComponentDefinition) => {
+function getOrCreatePinia() {
+    // We sometimes use this utility mounting function in a context where there
+    // is no existing vue application or pinia store (e.g. individual charts
+    // displayed in an iframe).
+    // To support both use cases, we will create a new pinia store and attach it
+    // to the vue application that is created for the component if missing.
+    return getActivePinia() || createPinia();
+}
+
+export function mountVueComponent(ComponentDefinition) {
     const component = Vue.extend(ComponentDefinition);
-    const pinia = getActivePinia();
-    return (propsData, el) => new component({ propsData, el, pinia });
-};
+    return function (propsData, el) {
+        return new component({ propsData, el, pinia: getOrCreatePinia() });
+    };
+}
 
-export const replaceChildrenWithComponent = (el, ComponentDefinition, propsData = {}) => {
+export function replaceChildrenWithComponent(el, ComponentDefinition, propsData = {}) {
     const container = document.createElement("div");
     el.replaceChildren(container);
-    const component = Vue.extend(ComponentDefinition);
-    const pinia = getActivePinia();
-    const mountFn = (propsData, el) => new component({ propsData, el, pinia });
+    const mountFn = mountVueComponent(ComponentDefinition);
     return mountFn(propsData, container);
-};
+}
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 7ff2b7b344e7..2bee6af8fa2d 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -9,9 +9,11 @@
 _:  # global stuff
 
   selectors:
+    center_panel: '#center'
     editable_text: '.editable-text'
     tooltip_balloon: '.tooltip'
     tooltip_inner: .tooltip-inner
+    left_panel: '#left'
     left_panel_drag: '.flex-panel.left .drag-handle'
     left_panel_collapse: '.collapse-button.left'
     right_panel_drag: '.flex-panel.right .drag-handle'
@@ -38,46 +40,28 @@ masthead:
   selectors:
     _: '#masthead'
 
-    # bootstrap-vue a tag doesn't work as link target, need to hit span inside
-    user: '#user.loggedin-only > a.nav-link.dropdown-toggle > span'
-    register_or_login: '#user.loggedout-only > .nav-link'
-
-    user_menu: '#user .dropdown-menu a'
-    workflow: '#workflow .nav-link'
-
-    username:
-      type: xpath
-      selector: '//a[contains(text(), "Signed in as")]'
-
+    help: '#help'
+    home: '#analysis'
+    login: '#user'
+    logout: '.dropdown-menu > li > a > .fa-sign-out-alt'
     logged_in_only: '.loggedin-only'
     logged_out_only: '.loggedout-only'
+    preferences: '.dropdown-menu > li > a > .fa-gear'
+    register_or_login: '#user.loggedout-only > .nav-link'
     storage_dashboard_link:
       selector: 'storage dashboard link'
       type: data-description
-
-  labels:
-    # top-level menus
-    admin: 'Admin'
-    analyze: 'Analyze Data'
-    data: 'Data'
-    help: 'Help'
-    user: 'User'
-    visualization: 'Visualization'
-    workflow: 'Workflow'
-
-    # user menu
-    logout: 'Sign Out'
-    preferences: 'Preferences'
-
-    # data menu
-    libraries: 'Data Libraries'
-    histories: 'Histories'
-    invocations: 'Workflow Invocations'
-    pages: 'Pages'
-    workflows: 'Workflows'
+    user: '#user.loggedin-only > a.nav-link > .fa'
+    username:
+      type: xpath
+      selector: '//a[contains(text(), "Signed in as")]'
+    window_manager: '#enable-window-manager'
+    workflow: '#workflow .nav-link'
 
 preferences:
   selectors:
+    activity: "#activity-settings"
+    activity_expand: ".activity-panel-footer"
     sign_out: "#edit-preferences-sign-out"
     change_password: "#edit-preferences-password"
     manage_information: '#edit-preferences-information'
@@ -457,6 +441,7 @@ collection_builders:
 
 histories:
   selectors:
+    activity: '#activity-histories'
     advanced_search_toggle: '#histories-grid [data-description="toggle advanced search"]'
     advanced_search_name_input: '#histories-advanced-filter-name'
     advanced_search_tag_area: '#histories-advanced-filter-tag .stateless-tags button'
@@ -532,6 +517,7 @@ history_import:
 
 pages:
   selectors:
+    activity: "#activity-pages"
     create: '#page-create'
     submit: '#submit'
     create_title_input: '#form-element-title input'
@@ -600,6 +586,7 @@ tool_form:
 
 workflows:
   selectors:
+    activity: '#activity-workflows'
     shared_with_me_tab: '#shared-with-me'
     published_tab: '#published a'
     new_button: '#workflow-create'
@@ -626,7 +613,7 @@ workflows:
     rename_input: '#workflow-name-input'
     workflow_drop_down: '[data-workflow-actions-dropdown]'
     delete_button: '.workflow-delete-button'
-    view_button: '.workflow-view-button'
+    view_button: '.workflow-name-preview'
     workflow_preview_container: '.workflow-card-preview-modal .workflow-published .published-workflow'
     workflow_preview_information: '.workflow-information'
     view_external_link: ".workflow-view-external-link-button"
@@ -650,6 +637,7 @@ workflows:
 visualization:
   selectors:
     _: '#center div.plugin-list'
+    activity: '#activity-visualizations'
     plugin_item: '[data-plugin-name*="${id}"]'
 
 trs_search:
@@ -855,6 +843,8 @@ workflow_show:
 
 invocations:
   selectors:
+    activity: "#activity-invocation"
+    activity_expand: ".activity-panel-footer"
     invocations_table: '#invocations-grid .grid-table'
     invocations_table_rows: '#invocations-grid .grid-table [data-description="grid item"]'
     pager: '[data-description="grid pager"]'
@@ -900,6 +890,15 @@ tour:
       next: '${_} .tour-next'
       end: '${_} .tour-end'
 
+tools:
+  selectors:
+    activity: '#activity-tools'
+    body: '#center #tool-card-body'
+    execute: '#execute'
+    help: 'div.form-help'
+    search: '.search-query'
+    title: '.toolSectionTitle'
+
 admin:
   allowlist:
     selectors:
@@ -1008,6 +1007,7 @@ libraries:
 
   selectors:
     _: '#libraries_list'
+    activity: '#activity-libraries'
     create_new_library_btn: '#create-new-lib'
     permission_library_btn: '.permission_library_btn'
     toolbtn_save_permissions: '.toolbtn_save_permissions'
@@ -1128,6 +1128,7 @@ upload:
     source_button: '#upload-row-${n} .upload-source'
     start: '#activity-upload'
     start_button: '#btn-start'
+    local_button: '#btn-local'
 
 new_user_welcome:
   selectors:
diff --git a/client/yarn.lock b/client/yarn.lock
index 64aea473dbb4..41149100f7d9 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -12188,15 +12188,10 @@ write-file-atomic@^4.0.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-ws@^8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
-
-ws@^8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@^8.11.0, ws@^8.13.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 xml-beautifier@^0.5.0:
   version "0.5.0"
diff --git a/config/job_conf.yml.interactivetools b/config/job_conf.yml.interactivetools
index dfc00fb46b46..5ac519ebd4f2 100644
--- a/config/job_conf.yml.interactivetools
+++ b/config/job_conf.yml.interactivetools
@@ -41,8 +41,8 @@ execution:
 
       #docker_cmd: /usr/local/custom_docker/docker
       #docker_host:
-      #docker_container_id_override: busybox:ubuntu-14.04
-      #docker_default_container_id: busybox:ubuntu-14.04
+      #docker_container_id_override: busybox:1.36.1-glibc
+      #docker_default_container_id: busybox:1.36.1-glibc
       #require_container: true
       #container_monitor: true
       #container_monitor_result: file
diff --git a/config/job_conf.yml.interactivetools.podman b/config/job_conf.yml.interactivetools.podman
index b377c45f2c21..d634b2e7f83e 100644
--- a/config/job_conf.yml.interactivetools.podman
+++ b/config/job_conf.yml.interactivetools.podman
@@ -24,9 +24,9 @@ execution:
       docker_set_user:
 
       # For containers running as root (on the inside)
-      docker_run_extra_arguments: --security-opt label=disable
+      docker_run_extra_arguments: --security-opt label=disable --network slirp4netns:allow_host_loopback=true
       # Should work for containers with non-root user (on the inside)
-      #docker_run_extra_arguments:  --userns=keep-id --security-opt label=disable
+      #docker_run_extra_arguments:  --userns=keep-id --security-opt label=disable --network slirp4netns:allow_host_loopback=true
 
       # Change to home directory of the galaxy user, not the directory of the galaxy installation
       docker_cmd: HOME="/home/galaxy"; podman
diff --git a/config/plugins/tours/core.galaxy_ui.yaml b/config/plugins/tours/core.galaxy_ui.yaml
index 8cdbed21d4a1..eb950864e7a7 100644
--- a/config/plugins/tours/core.galaxy_ui.yaml
+++ b/config/plugins/tours/core.galaxy_ui.yaml
@@ -22,16 +22,16 @@ steps:
       postclick: true
 
     - title: "Upload your data"
-      element: "#btn-local"
+      component: upload.local_button
       intro: "You can upload data from your computer."
 
     - title: "Upload your data"
-      element: "#btn-new"
+      component: upload.create_button
       intro: "Copy and paste data directly into Galaxy or include URLs that lead to your data"
       preclick: true
 
     - title: "Insert URLs"
-      element: ".upload-text-content"
+      component: upload.paste_content(n=0)
       intro: "URLs separated by a line break are automatically downloaded by Galaxy."
       textinsert: |
         https://raw.githubusercontent.com/bgruening/galaxytools/adf077b912ddebd97b07b947b855cdd2862ed8ef/tools/augustus/test-data/human_augustus.fa
@@ -49,15 +49,15 @@ steps:
       postclick: true
 
     - title: "Tools"
-      element: "#left"
+      component: _.left_panel
       intro: "This is your ToolBox. All tools available in your Galaxy instance you can find here."
 
     - title: "Tool categories"
-      element: '.toolSectionTitle'
+      component: tools.title
       intro: "Tools are grouped into categories to make them easier to find."
 
     - title: "Tool search bar"
-      element: '.search-query'
+      component: tools.search
       intro: "You can search for tools by keywords."
       textinsert: 'filter'
 
@@ -67,26 +67,26 @@ steps:
       postclick: true
 
     - title: "Filter Tool"
-      element: '#center'
+      component: _.center_panel
       intro: "Your tool is loaded into the main Galaxy page and ready for use."
 
     - title: "Tool parameters"
-      element: '#center #tool-card-body'
+      component: tools.body
       intro: "Here you can choose your tool parameters. Select your input dataset from your history and specify parameters for your analysis."
 
     - title: "Tool help"
-      element: 'div.form-help'
+      component: tools.help
       intro: "Every Galaxy tool has a help section with detailed information about the tool and its parameters.
               Have a look and study your tool in depth by reading it."
 
     - title: "Run your tool"
-      element: '#execute'
+      component: tools.execute
       intro: "Click on 'Execute' to run your tool and send it to the compute cluster.
               Don't be afraid to test different settings in parallel. Galaxy can handle multiple runs of the same tool."
       postclick: true
 
     - title: "History"
-      element: "#current-history-panel"
+      component: history_panel
       intro: "This is your Galaxy history! All analysis steps with results of the tools and their parameters will be recorded here and can be redone at any time.<br>
               A running tool is shown in yellow and if your calculation is done, it turns green. If your dataset is
               grey this means you are queued and need to wait until your tool can be started. If your dataset turns into red, an error has occurred. Please report the bug to the Galaxy team with the bug report button."
@@ -117,37 +117,30 @@ steps:
       element: "#current-history-panel div.content-item .rerun-btn"
       intro: "By clicking the reload button, you can re-run your tool again (e.g. with different parameters or on another dataset)."
 
-    - title: "Top panel"
-      element: "#masthead"
-      intro: "The top panel will give you access to a lot of useful things."
-
     - title: "Analyze data"
+      component: masthead.home
       element: "#analysis"
       intro: "This is the current view. Start your <b>Analysis</b> from here."
 
     - title: "Workflow"
-      element: "#workflow"
+      component: workflows.activity
       intro: "Create, manage, import, export and share your <b>Workflows</b>."
-
-    - title: "Data"
-      element: "#resources"
-      intro: "Get access to all <b>Workflows</b>, <b>Histories</b>, <b>Pages</b> and <b>Visualizations</b>."
-
+    
     - title: "Visualization"
-      element: "#visualization"
+      component: visualization.activity
       intro: "Galaxy offers a lot of visualizations to review your data!"
 
     - title: "Help"
-      element: "#help"
+      component: masthead.help
       intro: "Here you get more help from the Galaxy <b>Community</b> with Videos, a QA board and more tours."
 
-    - title: "User Preferences"
-      element: "#user"
-      intro: "Login and start your analysis!"
-
     - title: "Window Manager"
-      element: "#enable-window-manager"
+      component: masthead.window_manager
       intro: "Window Manager offers you multiple visualizations next to each other. Have a look at our Window Manager tour to learn more about it."
 
+    - title: "Login"
+      component: masthead.login
+      intro: "Login and start your analysis!"
+
     - title: "Enjoy Galaxy"
       intro: "Thanks for taking this tour! Happy research with Galaxy!"
diff --git a/doc/source/admin/jobs.md b/doc/source/admin/jobs.md
index 5d87c9c429c9..dcb7f75a3f74 100644
--- a/doc/source/admin/jobs.md
+++ b/doc/source/admin/jobs.md
@@ -159,7 +159,7 @@ execution:
       k8s_namespace: default
       runner: pulsar_k8s
       docker_enabled: true
-      docker_default_container_id: busybox:ubuntu-14.04
+      docker_default_container_id: busybox:1.36.1-glibc
       pulsar_app_config:
         message_queue_url: 'amqp://guest:guest@host.docker.internal:5672//'
     local_environment:
diff --git a/doc/source/admin/special_topics/interactivetools.rst b/doc/source/admin/special_topics/interactivetools.rst
index 73fd0c00731c..da75caec2095 100644
--- a/doc/source/admin/special_topics/interactivetools.rst
+++ b/doc/source/admin/special_topics/interactivetools.rst
@@ -174,8 +174,8 @@ An example ``job_conf.yml`` file as seen in ``config/job_conf.yml.interactivetoo
 
           #docker_cmd: /usr/local/custom_docker/docker
           #docker_host:
-          #docker_container_id_override: busybox:ubuntu-14.04
-          #docker_default_container_id: busybox:ubuntu-14.04
+          #docker_container_id_override: busybox:1.36.1-glibc
+          #docker_default_container_id: busybox:1.36.1-glibc
           #require_container: true
           #container_monitor: true
           #container_monitor_result: file
diff --git a/doc/source/admin/special_topics/mulled_containers.rst b/doc/source/admin/special_topics/mulled_containers.rst
index 38e883667c53..332a9806b73d 100644
--- a/doc/source/admin/special_topics/mulled_containers.rst
+++ b/doc/source/admin/special_topics/mulled_containers.rst
@@ -16,7 +16,7 @@ requirement field.
 
     <requirements>
         <!-- Container based dependency handling -->
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
         <!-- Conda based dependency handling -->
         <requirement type="package" version="8.22">gnu_coreutils</requirement>
     </requirements>
diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst
index 75d1ff7d469d..22f4783be918 100644
--- a/doc/source/dev/create_release.rst
+++ b/doc/source/dev/create_release.rst
@@ -36,11 +36,12 @@ and that you have configured your remotes so that you can push to the configured
 The script should abort gracefully if that is not the case.
 
 Follow these steps:
+    0. Enable the push URL of the galaxyproject git remote if you have disabled it (e.g. `git remote set-url --push upstream git@github.com:galaxyproject/galaxy.git`) and disable any pre-commit hooks you might have
     1. Check out the branch from which you want to create a release, e.g. release_23.0: `git checkout release_23.0`
     2. Activate your local virtualenv with Galaxy's dev requirements: `. .venv/bin/activate`
     3. Update Galaxy's dev dependencies (if you haven't done this in a while): `pip install -r lib/galaxy/dependencies/dev-requirements.txt`
     4. You need a personal access token from github (only needs public read permissions).
-    5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_3 galaxy-release-util create-release --new-version 23.0.1 --last-commit v23.0`
+    5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_4 galaxy-release-util create-release --new-version 23.0.1 --last-commit v23.0`
     6. Follow along the prompts and make sure the proposed changes look correct
 
 When the script is finished you should find a new tag in the GitHub interface, as well as updated release and dev branches.
diff --git a/doc/source/releases/24.1.rst b/doc/source/releases/24.1.rst
new file mode 100644
index 000000000000..c050b13775a6
--- /dev/null
+++ b/doc/source/releases/24.1.rst
@@ -0,0 +1,965 @@
+
+.. to_doc
+
+24.1
+===============================
+
+.. announce_start
+
+Enhancements
+-------------------------------
+
+.. major_feature
+
+
+.. feature
+
+* Release notes
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18218`_
+* Implement a page object accessibility dialog
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17225`_
+* Enable all-vs-all collection analysis patterns
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17366`_
+* Visualizing workflow runs with an invocation graph view
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 17413`_
+* Enables activity bar by default
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17531`_
+* Add onedata objectstore
+  (thanks to `@bwalkowi <https://github.com/bwalkowi>`__).
+  `Pull Request 17540`_
+* Add content assertion XML tags for test output verification using images
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17581`_
+* Workflow editor item selection
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 17615`_
+* Workflow editor undo/redo
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 17774`_
+* Enable managing object store usage within a history.
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17853`_
+* Add `email` notifications channel
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 17914`_
+* Script for deleting userless histories from database + testing + drop unused model testing code
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18079`_
+* Add Net datatype
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18080`_
+* Overhaul Azure storage infrastructure
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18087`_
+* Empower users to bring their own storage and file sources
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18127`_
+* More unit testing for object store stuff
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18136`_
+* Add an Invocations Panel for the Invocations activity
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18137`_
+.. enhancement_tag_viz
+
+* Update parcel-built visualizations to use parcel v2
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18311`_
+.. enhancement_tag_datatypes
+
+* Tighten axt sniffer
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18204`_
+* Better display of estimated line numbers and add number of columns for tabular
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17492`_
+* Add colabfold tar file datatype
+  (thanks to `@astrovsky01 <https://github.com/astrovsky01>`__).
+  `Pull Request 17567`_
+* Set minimal metadata also for empty bed datasets
+  (thanks to `@wm75 <https://github.com/wm75>`__).
+  `Pull Request 17586`_
+* Add support for additional media types
+  (thanks to `@arash77 <https://github.com/arash77>`__).
+  `Pull Request 18054`_
+.. enhancement_tag_tools
+
+* Backport Qiskit Jupyter Notebook update to 24.1
+  (thanks to `@natefoo <https://github.com/natefoo>`__).
+  `Pull Request 18310`_
+* Rename JupyTool to something more searchable (i.e. JupyterLab which includes the substring Jupyter)
+  (thanks to `@hexylena <https://github.com/hexylena>`__).
+  `Pull Request 17849`_
+.. enhancement_tag_workflows
+
+* Allow running and editing workflows for specific versions
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18378`_
+* Update labels in Markdown editor when workflow labels change
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17863`_
+* Add galaxy to user agent
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18003`_
+.. enhancement_tag_ui
+
+* Add vue sentry integration
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18120`_
+.. enhancement_tag_jobs
+
+* Only include tool stdout/stderr in HDA info
+  (thanks to `@natefoo <https://github.com/natefoo>`__).
+  `Pull Request 16730`_
+* Fix boto3-stubs typecheck dependency
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18173`_
+.. enhancement_tag_admin
+
+* Add some admin facing docs on data tables
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17585`_
+* Make urgent notifications mandatory
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 17975`_
+* Add middleware for logging start and end of request
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18046`_
+.. enhancement
+
+* Backport `#18197 <https://github.com/galaxyproject/galaxy/issues/18197>`__
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18212`_
+* Drop restriction to switch to immutable histories
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18234`_
+* Allow bookmarking public workflows
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18247`_
+* More structured indexing for user data objects
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18291`_
+* Display error message if not an image in reports
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18309`_
+* Add copy link to published workflow in `WorkflowCard`
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18370`_
+* Onedada object store and files source stability fixes
+  (thanks to `@bwalkowi <https://github.com/bwalkowi>`__).
+  `Pull Request 18372`_
+* Persistent toggle sections of job info
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 16983`_
+* Enable storage management by object store
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17500`_
+* Automatically bind `galaxy_data_manager_data_path` in containers
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17596`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17653`_
+* Tool linter: check for valid bio.tools entries
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17655`_
+* Tool linter: check for leaf nodes with unstripped text content
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17656`_
+* Addition of release process doc
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 17680`_
+* Issue `#17631 <https://github.com/galaxyproject/galaxy/issues/17631>`__: Make it possible to use custom invfile.lua if needed
+  (thanks to `@martin-g <https://github.com/martin-g>`__).
+  `Pull Request 17693`_
+* Add browser and operating system info to issue template
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 17696`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17764`_
+* SQLAlchemy 2.0
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 17778`_
+* Add support for floating point TIFF files in verification of image-based tool outputs
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17797`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17819`_
+* Add tool linting for valid EDAM terms
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17839`_
+* Add `pin_labels` attribute for `image_diff` comparison method
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17866`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17870`_
+* Add admin activity to activity bar
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17877`_
+* Disable published item copy button when editing slug
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 17888`_
+* Outline use of type_annotation_map to fix mypy issues
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17902`_
+* Do not save workflow on Run without user confirmation
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 17907`_
+* Update config docs about Celery
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 17918`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17923`_
+* Adds pages to the activity bar
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17925`_
+* Revises visualizations activity
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17931`_
+* Error reporting unit tests
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17968`_
+* Update _thanks.rst in the User Release Notes to include new socials and remove inactive ones
+  (thanks to `@natwhitaker <https://github.com/natwhitaker>`__).
+  `Pull Request 17971`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 17982`_
+* Add tags to data dialog display, restores update_time and extension columns
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17992`_
+* Reduce notifications polling frequency
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18010`_
+* Consolidate Visualization container, avoid using default iframe
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18016`_
+* Document syntax for accessing nested parameters in `change_format` - `when` tags
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 18018`_
+* Add Zenodo integration
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18022`_
+* Add a button that filters out a tool section in the tool panel
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18034`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 18035`_
+* Add datasets/collections filter to history panel filters
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18039`_
+* Add pagination support to Files Source plugins
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18059`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 18063`_
+* Add Attributes section to Edit Collection view as well
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18071`_
+* Enhance form drilldown
+  (thanks to `@hujambo-dunia <https://github.com/hujambo-dunia>`__).
+  `Pull Request 18074`_
+* Change `InvocationsList` into a grid using `GridList`
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18088`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 18095`_
+* Workflow preview improvements
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18108`_
+* Drop "?" (Help) from DatasetActions list
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18124`_
+* Update Python dependencies
+  (thanks to `@galaxybot <https://github.com/galaxybot>`__).
+  `Pull Request 18125`_
+* Revises handling of warnings in the workflow run form
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18126`_
+* Display DOIs in Archived Histories
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18134`_
+* Update s3fs dependency
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18135`_
+* Harden User Object Store and File Source Creation
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18172`_
+* Move activity panel go to button to top
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18182`_
+* Update db revision 24.1 release tags
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18183`_
+* Play nice with password managers
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18206`_
+.. small_enhancement
+
+* Remove deprecated BCO export endpoint
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 16645`_
+* Login components refactors
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 17564`_
+* Collections common refactors
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 17571`_
+* Modernization and cleanup of job state related client code
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17593`_
+* Type annotation improvements
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17601`_
+* Type annotation and CWL-related improvements
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17630`_
+* Collection components refactors
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 17647`_
+* Code cleanups from ruff and pyupgrade
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17654`_
+* Activity bar preference handling fixes
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 17701`_
+* Datasets refactors
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 17799`_
+* Consolidates data dialog components
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17802`_
+* Dataset information refactors
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 17804`_
+* Mailing list wording tweaks
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 17867`_
+* Model edits and bug fixes
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 17922`_
+* Fix client types around history items
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 17924`_
+* Model typing and SA2.0 follow-up
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 17958`_
+* Use typed API client for reporting job errors
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17969`_
+* Drop unused workflow controller methods
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17974`_
+* Enable ``warn_unused_ignores`` mypy option
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17991`_
+* Refactor convert HistoryExport component to Typescript
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18028`_
+* More typing in galaxy.files
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18037`_
+* Refactor galaxy.files plugin loading + config handling
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18049`_
+* Add stronger type annotations in file sources + refactoring
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18050`_
+* Enable flake8-implicit-str-concat ruff rules
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18067`_
+* Ensure history `update_time` is set when exporting
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18086`_
+* De-duplication of onedata objectstore code
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18174`_
+
+
+Fixes
+-------------------------------
+
+.. major_bug
+
+
+.. bug_tag_viz
+
+* Check various preconditions in FeatureLocationIndexDataProvider
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18283`_
+* Adds pinia to manually mounted vue components
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18299`_
+* Fix visualizations compatible dataset filtering
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18343`_
+* Fix pca 3d rendering of tabular files and visualization error handling in general
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18211`_
+.. bug_tag_datatypes
+
+* Don't set dataset peek for errored jobs
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18231`_
+* Npz sniffing: do not read the whole file
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17672`_
+* Never fail dataset serialization if display_peek fails
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17937`_
+.. bug_tag_tools
+
+* Raise exception when extracting dataset from collection without datasets
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18249`_
+* Fix null inputs in database operation tools
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18385`_
+.. bug_tag_workflows
+
+* Drop unnecessary escaping for workflow name and annotation
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18376`_
+* Fix invocation step_job_summary for new collections
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18402`_
+* Fix `input_step_parameters` missing values that don't have a label
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18405`_
+* Fixes for mapping workflow labels to markdown dialogs
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17424`_
+* Fix workflow run form failing on certain histories
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17869`_
+* Make sure step removal also resets mapOver state
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17915`_
+* Fix workflow run form for workflows with null rename PJA
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17929`_
+* Fix missing implicit conversion for mapped over jobs
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17952`_
+* Fix `LengthValidator` if no value passed
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17983`_
+* Use or copy StoredWorkflow when copying step
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17988`_
+* Don't commit in ``DeleteIntermediatesAction``
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18131`_
+* Fix submitted value in workflow run form if data is constrained by tag filter
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18193`_
+.. bug_tag_ui
+
+* Bump es5-ext from 0.10.62 to 0.10.63 in /client
+  (thanks to `@dependabot[bot] <https://github.com/dependabot[bot]>`__).
+  `Pull Request 17555`_
+* Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /client
+  (thanks to `@dependabot[bot] <https://github.com/dependabot[bot]>`__).
+  `Pull Request 17820`_
+* Bump express from 4.18.1 to 4.19.2 in /client
+  (thanks to `@dependabot[bot] <https://github.com/dependabot[bot]>`__).
+  `Pull Request 17840`_
+* Bump undici from 5.28.3 to 5.28.4 in /client
+  (thanks to `@dependabot[bot] <https://github.com/dependabot[bot]>`__).
+  `Pull Request 17905`_
+* Update prebuilt client
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18000`_
+* Fix tag regex pattern
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18025`_
+.. bug_tag_jobs
+
+* Restrict job_files access to jobs that are not terminal
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18217`_
+* Raise appropriate exception if accessing deleted input file
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18223`_
+* Fix seek in slurm memory check
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18338`_
+* Do not copy purged outputs to object store
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18342`_
+* Kill pulsar job if job stopped on galaxy side
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18348`_
+* Always discard session after __handle_waiting_jobs is done
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17913`_
+* Fix tool form building if select filters from unavailable dataset metadata
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17930`_
+* Fix ``InvalidRequestError: Can't operate on closed transaction inside context manager.  Please complete the context manager before emitting further
+  commands.``
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17932`_
+* Downgrade missing output file in working directory to warning for failed jobs
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18123`_
+* Drop redundant error message
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18156`_
+* Don't fail metadata if we only have an extra output files dir
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18179`_
+* Avoid object store path lookup when constructing JobState object
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18190`_
+.. bug_tag_admin
+
+* Only log error if deleting directory really failed
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18236`_
+* Rebuild Galaxy config
+  (thanks to `@bgruening <https://github.com/bgruening>`__).
+  `Pull Request 18325`_
+* Downgrade doi fetch error to debug
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18330`_
+* Include exception info when something goes wrong while refreshing tokens
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18008`_
+* Don't log exception if cancelled slurm job doesn't have stderr file
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18121`_
+* Downgrade count lines error to warning
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18175`_
+* Emit warning when user-cancelled job already complete
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18178`_
+* Include stack when reporting delete error
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18208`_
+.. bug
+
+* Pin pydantic to >=2.7.4
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18423`_
+* do not expand datasets that are known to be inaccessible
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 17818`_
+* Prevent anonymous and inactive users from running workflows
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18192`_
+* Revert some requests import changes
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18199`_
+* Check dataset state when attempting to acces dataset contents
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18214`_
+* Raise ``RequestParameterInvalidException`` if url can't be verified
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18230`_
+* Reset content-length for unhandled exceptions
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18233`_
+* Fix element serialization for collections that aren't populated yet
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18235`_
+* Fix userOwnsHistory conditions
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18243`_
+* Small bug fixes for user data plugins
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18246`_
+* Transparently open compressed files in DatasetDataProvider
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18248`_
+* Skip tests if toolshed, dx.doi not responding
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18250`_
+* Fix history export error handling
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18251`_
+* Remove linter for unstripped text content for tool xml leaves
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 18252`_
+* Fix Invenio credentials handling
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18255`_
+* Set page importable to false when serializing
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18263`_
+* Add missing TS migration
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18267`_
+* Format with black
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18273`_
+* Fix handler: access to result row items changed in SA2.0
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18274`_
+* Don't attempt to download purged datasets
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18278`_
+* Fix first_dataset_element type hint
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18284`_
+* Redirect anonymous users to home when importing public histories
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18286`_
+* Use correct link for log in or register in Copy Modal
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18289`_
+* Add TS db revision tags for 24.0
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18294`_
+* Move tool shed specific driver function to tool_shed.test
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18296`_
+* Fix various packages' issues
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18301`_
+* Fix "label updated" popup triggers too often
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 18303`_
+* Adapt Tool prediction API to Transformer-based deep learning architecture
+  (thanks to `@anuprulez <https://github.com/anuprulez>`__).
+  `Pull Request 18305`_
+* Fix word bleeding in modals, sharing page and history rename
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18306`_
+* Don't serialize display application links for deleted datasets
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18307`_
+* Fix non-history items drag&drop into histories
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18308`_
+* Filter data dialog entries by dataset state, only display `ok` state
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18313`_
+* Fix pinia in manually mounted components
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18315`_
+* Disable state filter for collections in `HistoryFilters`
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18324`_
+* Fix users API serialization when listing users
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18329`_
+* Fix authentication error for anonymous users querying jobs
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18333`_
+* Make sure that all Linter subclasses are imported for listing them
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 18339`_
+* Fix anonymous user job retrieval logic
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18358`_
+* Fix check for anonymous
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18364`_
+* Fix update group API payload model
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18374`_
+* Sanitize FormElement error messages
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18377`_
+* Fix empty usernames in database + bug in username generation
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18379`_
+* Fix user's private role can be missing
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18381`_
+* Fix duplicated requests when browsing files sources with pagination
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18387`_
+* Fix dataset details polling re-render
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18388`_
+* Assign default ``data`` extension on discovered collection output
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18389`_
+* Fix workflow editor tool form scroll memory
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 18390`_
+* Reset current page when browsing sub-folders in FilesSources
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18395`_
+* Fix workflow tags initialisation in workflow editor
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18396`_
+* Fix ``get_accessible_job`` if called without session
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18400`_
+* Allow in_range validator for selects
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 18403`_
+* Ensure datatypes match on dragging elements into FormData
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18410`_
+* Really allow in-range validator for txt
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 18411`_
+* Fix collection map over status for dragged collections
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18416`_
+* Add TypedDict for JobsSummary
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18418`_
+* Serialize purged flag for datasets in collections
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18420`_
+* Unpin social-auth-core dependency
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17607`_
+* remove reference to a non-existent component
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 17686`_
+* Add carbon_intensity.csv to package
+  (thanks to `@nuwang <https://github.com/nuwang>`__).
+  `Pull Request 17748`_
+* Fix bug in image_util.py
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17749`_
+* Fix bug in galaxy.xsd
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17752`_
+* Fix bug in `assert_has_image_n_labels`
+  (thanks to `@kostrykin <https://github.com/kostrykin>`__).
+  `Pull Request 17754`_
+* Fix odd object store exception
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 17810`_
+* Fix permissions for temporary upload file for API uploads
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17850`_
+* Fix tool version switch in editor
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17858`_
+* Remove duplicate tool panel insertion, rely on activity bar
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17872`_
+* Fix hasOwner function for histories in client
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 17886`_
+* Always serialize element_count and populated when listing contents
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17890`_
+* Make `wait_for_history_jobs` look at jobs, not datasets
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17892`_
+* Fix release notes
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 17894`_
+* Fix deadlock that can occur when changing job state
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17896`_
+* Fix search and version menu in docs
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17898`_
+* Fix conditional Image imports
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17899`_
+* Fix lost reports when switching workflow versions
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17904`_
+* Fix saving user preferences crashes tab
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 17917`_
+* Ensures that the activity bar is not shown when use_panels is set to false
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 17926`_
+* Replace sample Celery result_backend in config
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 17949`_
+* Show dataset image in workflow_outputs display listing
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 17964`_
+* Fix get_content_as_text for compressed text datatypes
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17976`_
+* History import - show user feedback on completion
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 17980`_
+* Backport: Fix bug: call unique() on result, not select stmt
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 17981`_
+* Raise ``RequestParameterInvalidException`` if collection element has unknown extension
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17985`_
+* Don't attempt to commit in dry_run mode
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17987`_
+* Don't fail if reporting invalid parameter values
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18002`_
+* Preserve surrounding whitespace when localizing complex nodes
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18005`_
+* Add section divider to activity bar, fix click handler
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18007`_
+* Raise ``MessageException`` when report references invalid workflow output
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18009`_
+* Avoid exception when opening apply rules tool and no collection in history
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18011`_
+* Don't commit without having set a hid
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18014`_
+* Make celery fixture available in framework tests
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18020`_
+* Add a link to histories list in history import message for situations…
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18021`_
+* Raise appropriate exception if user forces a collection that is not populated with elements as input
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18023`_
+* Fix ``test_get_tags_histories_content`` test
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18026`_
+* Clarify the object store relocate functionality
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18033`_
+* Fix History Dataset Association creation so that hid is always set
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18036`_
+* Change wrong quota_source value from KeyError to ValueError
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18040`_
+* Ensure that offset and limit are never negative
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18044`_
+* Fix comments lost on import
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 18060`_
+* Fix (I think) a transiently failing selenium error
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18065`_
+* Check database connection to issue a rollback if no connection
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18070`_
+* Fix toolbar header z-index
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18084`_
+* Dynamic tool fixes
+  (thanks to `@dcore94 <https://github.com/dcore94>`__).
+  `Pull Request 18085`_
+* Raise exception if collection elements missing during download
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18094`_
+* Tests and bugfixes for cloudbridge object store
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18099`_
+* Fix AWS object store for us-east-2
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18100`_
+* Hide bookmark toggle on deleted workflows
+  (thanks to `@itisAliRH <https://github.com/itisAliRH>`__).
+  `Pull Request 18103`_
+* Fix for unexpected OIDC XML validation error
+  (thanks to `@Edmontosaurus <https://github.com/Edmontosaurus>`__).
+  `Pull Request 18106`_
+* Fix vanishing connections on workflow upgrade
+  (thanks to `@ElectronicBlueberry <https://github.com/ElectronicBlueberry>`__).
+  `Pull Request 18107`_
+* Fix activity bar touch events on iOS devices
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18109`_
+* Fairly critical fix for `#18087 <https://github.com/galaxyproject/galaxy/issues/18087>`__
+  (thanks to `@jmchilton <https://github.com/jmchilton>`__).
+  `Pull Request 18110`_
+* Fix and unify axios error handling
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18112`_
+* Fix switching between nested collection elements
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18115`_
+* Ignore AdminRequired and RegisteredUserRequired Sentry events
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18118`_
+* Fix deprecated `deprecated` argument
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18119`_
+* Include traceback when logging email PJA exception
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18122`_
+* Fix listing possibly untitled records in Invenio Plugin
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18130`_
+* Fix data default values not getting added to history
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18132`_
+* Fix undefined `reading 'produces_entry_points'` TypeError
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18141`_
+* Fix config access in StorageManager
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18143`_
+* Fix Legacy HTML page view
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18145`_
+* Delay tool form rendering until config is loaded
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18151`_
+* Raise ``RequestParameterInvalidException`` when url is invalid
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18155`_
+* Fix error message when accessing restricted Zenodo records
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18169`_
+* Small refinements and fixes to new release process doc
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18170`_
+* Add message to Invocations panel for no invocations
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18180`_
+* Fix typos in create release documentation page
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18181`_
+* Change default milestone to target 24.2
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18186`_
+* Fix Edit Dataset UI when there is an error retrieving the dataset
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18188`_
+* Fix file source search query with empty string value
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18191`_
+* Replace `Multiselect` `selectLabel` with icons in `FormSelect`
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18194`_
+* Fix `make all histories private` with immutable histories
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18200`_
+* Fix selection highlight in Files Dialog when using items provider
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18201`_
+* Remove legacy code, reference to sqlalchemy migrate
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18202`_
+* Add `GenericItem` error handling
+  (thanks to `@ahmedhamidawan <https://github.com/ahmedhamidawan>`__).
+  `Pull Request 18203`_
+* Add string cast for dbkey / genome_build
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18207`_
+* Use config_section to distinguish between galaxy and ts or other apps
+  (thanks to `@jdavcs <https://github.com/jdavcs>`__).
+  `Pull Request 18215`_
+
+.. include:: 24.1_prs.rst
+
diff --git a/doc/source/releases/24.1_announce.rst b/doc/source/releases/24.1_announce.rst
index 1f5bb0791728..3e60e518e7d6 100644
--- a/doc/source/releases/24.1_announce.rst
+++ b/doc/source/releases/24.1_announce.rst
@@ -1,12 +1,301 @@
 
-:orphan:
+===========================================================
+24.1 Galaxy Release (June 2024)
+===========================================================
+
+.. include:: _header.rst
 
+Highlights
 ===========================================================
-June 2024 Galaxy Release (v 24.1)
+
+**Visualizing workflow runs with an invocation graph view.** A graph view has been added to the workflow invocation summary. This feature uses the original workflow structure to display job states for each step on the workflow editor canvas.
+
+**Workflow editor undo/redo.** Undo/redo functionality has been added to the workflow editor, enhancing the user experience and workflow management.
+
+**Select multiple items in workflow editor.** New selection features have been added to the Workflow Editor that simplify the process of selecting and managing multiple elements.
+
+**All-vs-all collection analysis patterns.** Galaxy now matches corresponding datasets when multiple collections are used to map over a tool, akin to a dot product pattern.
+
+**Pagination support added to files source plugins.** To improve navigation of remote file sources potentially containing vast numbers of files, server-side pagination support has been added to file source plugins.
+
+**Zenodo integration.** A new Zenodo file source plugin based on Invenio has been added.
+
+**Document Object Identifiers displayed in archived histories.** Histories that have been archived and preserved in an external repository like Zenodo will now display their Document Object Identifier (DOI).
+
+**Activity bar** is now enabled by default.
+
+Also check out the `24.1 user release notes <24.1_announce_user.html>`__.
+Are you an admin? Check out `some admin relevant PRs <https://github.com/galaxyproject/galaxy/pulls?q=label%3Ahighlight%2Fadmin+milestone%3A24.1+is%3Aclosed+is%3Apr>`__.
+
+Get Galaxy
 ===========================================================
 
+The code lives at `GitHub <https://github.com/galaxyproject/galaxy>`__ and you should have `Git <https://git-scm.com/>`__ to obtain it.
+
+To get a new Galaxy repository run:
+  .. code-block:: shell
+
+      $ git clone -b release_24.1 https://github.com/galaxyproject/galaxy.git
+
+To update an existing Galaxy repository run:
+  .. code-block:: shell
+
+      $ git fetch origin && git checkout release_24.1 && git pull --ff-only origin release_24.1
+
+See the `community hub <https://galaxyproject.org/develop/source-code/>`__ for additional details on source code locations.
 
-Schedule
+
+Administration Notes
 ===========================================================
- * Planned Freeze Date: 2024-05-13
- * Planned Release Date: 2024-06-03
+
+* ``fastapi`` dependency has been replaced with ``fastapi-slim`` [`#18095 <https://github.com/galaxyproject/galaxy/pull/18095>`__]. To ensure a smooth upgrade, you should uninstall ``fastapi`` before upgrading.
+  If you have upgraded without uninstalling ``fastapi``, you should uninstall ``fastapi``, then install ``fastapi-slim``.
+
+* Empowerinig users to bring their own storage and file sources [`#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`__]
+
+* Enabling storage management by object store [`#17500 <https://github.com/galaxyproject/galaxy/pull/17500>`__]
+
+* Email notifications channel [`#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`__]
+
+* Urgent notifications are now mandatory [`#17975 <https://github.com/galaxyproject/galaxy/pull/17975>`__]
+
+* Major update to Galaxy's data access layer: SQLAlchemy 2.0 [`#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`__]
+
+* Script for deleting userless histories from the database [`#18079 <https://github.com/galaxyproject/galaxy/pull/18079>`__]
+
+* New admin facing documentation on data tables [`#17585 <https://github.com/galaxyproject/galaxy/pull/17585>`__]
+
+Configuration Changes
+=====================
+
+Added
+-----
+
+The following configuration options are new
+
+config/user_preferences_extra_conf.yml.sample
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  preferences.zenodo
+-  preferences.zenodo_sandbox
+
+config/galaxy.yml.sample:galaxy
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  mapping.galaxy.mapping.celery_conf.default
+-  mapping.galaxy.mapping.dispatch_notifications_interval
+-  mapping.galaxy.mapping.file_source_templates
+-  mapping.galaxy.mapping.file_source_templates_config_file
+-  mapping.galaxy.mapping.object_store_templates
+-  mapping.galaxy.mapping.object_store_templates_config_file
+-  mapping.galaxy.mapping.user_config_templates_use_saved_configuration
+
+
+Changed
+-------
+
+The following configuration options have been changed
+
+config/user_preferences_extra_conf.yml.sample
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  preferences.onedata.inputs has changed from
+
+   ::
+
+    {'name': 'onezone_domain', 'label': 'Domain of the Onezone service (e.g. "demo.onedata.org")', 'type': 'text', 'required': False}
+    {'name': 'access_token', 'label': 'Your access token, suitable for REST API access in a Oneprovider service', 'type': 'password', 'required': False}
+
+   to
+
+   ::
+
+    {'name': 'onezone_domain', 'label': 'Domain of the Onezone service (e.g. datahub.egi.eu)', 'type': 'text', 'required': False}
+    {'name': 'access_token', 'label': 'Your access token, suitable for REST API access in a Oneprovider service', 'type': 'password', 'required': False}
+    {'name': 'disable_tls_certificate_validation', 'label': 'Allow connection to Onedata servers that do not present trusted SSL certificates. SHOULD NOT be used unless you really know what you are doing.', 'type': 'boolean', 'required': False, 'value': False}
+
+
+
+config/file_sources_conf.yml.sample
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-   has changed from
+
+   ::
+
+    {'type': 'dropbox', 'id': 'dropbox1', 'label': 'Dropbox files (configure access in user preferences)', 'doc': 'Your Dropbox files - configure an access token via the user preferences', 'access_token': "${user.preferences['dropbox|access_token']}"}
+    {'type': 'webdav', 'id': 'owncloud1', 'label': 'OwnCloud', 'doc': 'External OwnCloud files (configure access in user preferences)', 'url': "${user.preferences['owncloud|url']}", 'root': "${user.preferences['owncloud|root']}", 'login': "${user.preferences['owncloud|username']}", 'password': "${user.preferences['owncloud|password']}", 'temp_path': '/your/temp/path', 'writable': False}
+    {'type': 'posix', 'root': '/data/5/galaxy_import/galaxy_user_data/covid-19/data/sequences/', 'id': 'covid19-raw-sequences', 'label': 'COVID-19 FASTQ', 'doc': 'COVID-19 RAW sequences in FASTQ format'}
+    {'type': 'posix', 'root': '/data/db/databases/pdb/pdb/', 'id': 'pdb-gzip', 'doc': 'Protein Data Bank (PDB)', 'label': 'PDB'}
+    {'type': 'ftp', 'id': 'ebi-ftp', 'label': 'EBI FTP server', 'doc': 'European Bioinformatic Institute FTP server', 'host': 'ftp.ebi.ac.uk', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ftp', 'id': 'ncbi-ftp', 'label': 'NCBI FTP server', 'doc': 'NCBI FTP server', 'host': 'ftp.ncbi.nlm.nih.gov', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ftp', 'id': 'ensembl-ftp', 'label': 'ENSEMBL FTP server', 'doc': 'ENSEMBL FTP server', 'host': 'ftp.ensemblgenomes.org/vol1/pub/', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ssh', 'id': 'writeable-ssh-dir', 'requires_roles': 'writeable-galaxy-role', 'writable': True, 'label': 'Push your files to me', 'doc': 'This is an example of a writeable SSH dir', 'host': 'coolhost', 'user': 'user', 'passwd': 'passwd', 'timeout': 10, 'path': '/home/cooluser/', 'config_path': '', 'port': 2222}
+    {'type': 's3fs', 'label': 'My MinIO storage', 'endpoint_url': 'https://minio.usegalaxy.eu', 'id': 'galaxy-minio-storage', 'doc': 'Galaxy MinIO S3 storage', 'anon': False, 'secret': 'UHAJ6asd6asdhasd', 'key': 'MCJU76agdt98GGFAROIP7'}
+    {'type': 's3fs', 'label': 'Genome Ark', 'id': 'genomeark', 'doc': 'Access to Genome Ark open data on AWS.', 'bucket': 'genomeark', 'anon': True}
+    {'type': 's3fs', 'label': '1000 Genomes', 'id': '1000genomes', 'doc': 'Access to the 1000 Genomes Project with human genetic variation, including SNPs, structural variants, and their haplotype context.', 'bucket': '1000genomes', 'anon': True}
+    {'type': 's3fs', 'label': 'The Cancer Genome Atlas', 'id': 'tcga-2-open', 'doc': 'Access to the Cancer Genome Atlas (TCGA)', 'bucket': 'tcga-2-open', 'anon': True}
+    {'type': 's3fs', 'label': 'COVID-19 Data Lake', 'id': 'covid19-lake', 'doc': 'A centralized repository of up-to-date and curated datasets on or related to the spread and characteristics of the novel corona virus (SARS-CoV-2) and its associated illness, COVID-19', 'bucket': 'covid19-lake', 'anon': True}
+    {'type': 's3fs', 'label': 'Encyclopedia of DNA Elements (ENCODE)', 'id': 'encode-public', 'doc': 'The Encyclopedia of DNA Elements (ENCODE) Consortium is an international collaboration of research groups funded by the National Human Genome Research Institute (NHGRI)', 'bucket': 'encode-public', 'anon': True}
+    {'type': 's3fs', 'label': 'Sentinel-3', 'id': 'meeo-s3-nrt', 'doc': 'European Commission’s Copernicus Earth Observation Programme. Sentinel-3 is a polar orbiting satellite that completes 14 orbits of the Earth a day.', 'bucket': 'meeo-s3/NRT/', 'anon': True}
+    {'type': 's3fs', 'label': 'Sentinel-5P Level 2', 'id': 'meeo-s5p-nrti', 'doc': 'Observations from the Sentinel-5 Precursor satellite of the Copernicus Earth Observation Programme. It contains a polar orbiting satellite that completes 14 orbits of the Earth a day.', 'bucket': 'meeo-s5p/RPRO/', 'anon': True}
+    {'type': 's3fs', 'label': 'Coupled Model Intercomparison Project 6', 'id': 'esgf-world', 'doc': 'The sixth phase of global coupled ocean-atmosphere general circulation model ensemble', 'bucket': 'esgf-world', 'anon': True}
+    {'type': 's3fs', 'label': 'CMIP6 GCMs downscaled using WRF', 'id': 'wrf-cmip6-noversioning', 'doc': 'High-resolution historical and future climate simulations from 1980-2100', 'bucket': 'wrf-cmip6-noversioning', 'anon': True}
+    {'type': 's3fs', 'label': 'NOAA Global Forecast System (GFS)', 'id': 'noaa-gfs-bdp-pds', 'doc': 'The Global Forecast System (GFS) is a weather forecast model produced by the National Centers for Environmental Prediction (NCEP).', 'bucket': 'noaa-gfs-bdp-pds', 'anon': True}
+    {'type': 's3fs', 'label': 'NOAA Unified Forecast System Subseasonal to Seasonal Prototype 5', 'id': 'noaa-ufs-prototype5-pds', 'doc': 'The Unified Forecast System Subseasonal to Seasonal prototype 5 (UFS S2Sp5) dataset is reforecast data from the UFS atmosphere-ocean.', 'bucket': 'noaa-ufs-prototype5-pds', 'anon': True}
+    {'type': 's3fs', 'label': 'Copernicus Digital Elevation Model (DEM)', 'id': 'copernicus-dem-30m', 'doc': 'The Copernicus DEM is a Digital Surface Model (DSM) which represents the surface of the Earth including buildings, infrastructure and vegetation.', 'bucket': 'copernicus-dem-30m', 'anon': True}
+    {'type': 'http', 'label': 'Custom http filesource', 'id': 'httpcustom', 'url_regex': '^https?://myprotectedsite.org/', 'http_headers': {'Authorization': '#import base64\nBasic ${base64.b64encode(str.encode(user.preferences[\'myprotectedsite|username\'] + ":" + user.preferences[\'myprotectedsite|password\'])).decode()}'}, 'doc': 'Only define this if you want custom control over http downloads. You should also define a stock http source (below) or only downloads from this site will be allowed.'}
+    {'type': 'http', 'label': 'Stock http filesource', 'id': 'httpstock', 'doc': 'Make sure to define this generic http file source if you have defined any other http file sources, or stock http download capability will be disabled.'}
+    {'type': 'drs', 'label': 'Custom DRS filesource', 'id': 'drscustom', 'url_regex': '^drs://mydrssite.org/', 'http_headers': {'Authorization': '#import base64\nBasic ${base64.b64encode(str.encode(user.preferences[\'mydrssite|username\'] + ":" + user.preferences[\'mydrssite|password\'])).decode()}'}, 'doc': 'Define this if you want custom control over drs downloads. You should also define a stock drs source (below) or only downloads from this drs server will be allowed.'}
+    {'type': 'drs', 'label': 'Stock DRS filesource', 'id': 'drsstock', 'doc': 'Make sure to define this generic drs file source if you have defined any other drs file sources, or stock drs download capability will be disabled.'}
+    {'type': 'inveniordm', 'id': 'invenio_sandbox', 'doc': 'This is the Sandbox instance of Invenio. It is used for testing purposes only, content is NOT preserved. DOIs created in this instance are not real and will not resolve.', 'label': 'Invenio RDM Sandbox Repository (TESTING ONLY)', 'url': 'https://inveniordm.web.cern.ch/', 'token': "${user.user_vault.read_secret('preferences/invenio_sandbox/token')}", 'public_name': "${user.preferences['invenio_sandbox|public_name']}", 'writable': True}
+    {'type': 'onedata', 'id': 'onedata1', 'label': 'Onedata', 'doc': 'Your Onedata files - configure an access token via user preferences', 'accessToken': "${user.preferences['onedata|access_token']}", 'onezoneDomain': "${user.preferences['onedata|onezone_domain']}"}
+
+   to
+
+   ::
+
+    {'type': 'dropbox', 'id': 'dropbox1', 'label': 'Dropbox files (configure access in user preferences)', 'doc': 'Your Dropbox files - configure an access token via the user preferences', 'access_token': "${user.preferences['dropbox|access_token']}"}
+    {'type': 'webdav', 'id': 'owncloud1', 'label': 'OwnCloud', 'doc': 'External OwnCloud files (configure access in user preferences)', 'url': "${user.preferences['owncloud|url']}", 'root': "${user.preferences['owncloud|root']}", 'login': "${user.preferences['owncloud|username']}", 'password': "${user.preferences['owncloud|password']}", 'temp_path': '/your/temp/path', 'writable': False}
+    {'type': 'posix', 'root': '/data/5/galaxy_import/galaxy_user_data/covid-19/data/sequences/', 'id': 'covid19-raw-sequences', 'label': 'COVID-19 FASTQ', 'doc': 'COVID-19 RAW sequences in FASTQ format'}
+    {'type': 'posix', 'root': '/data/db/databases/pdb/pdb/', 'id': 'pdb-gzip', 'doc': 'Protein Data Bank (PDB)', 'label': 'PDB'}
+    {'type': 'ftp', 'id': 'ebi-ftp', 'label': 'EBI FTP server', 'doc': 'European Bioinformatic Institute FTP server', 'host': 'ftp.ebi.ac.uk', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ftp', 'id': 'ncbi-ftp', 'label': 'NCBI FTP server', 'doc': 'NCBI FTP server', 'host': 'ftp.ncbi.nlm.nih.gov', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ftp', 'id': 'ensembl-ftp', 'label': 'ENSEMBL FTP server', 'doc': 'ENSEMBL FTP server', 'host': 'ftp.ensemblgenomes.org/vol1/pub/', 'user': 'anonymous', 'passwd': '', 'timeout': 10, 'port': 21}
+    {'type': 'ssh', 'id': 'writeable-ssh-dir', 'requires_roles': 'writeable-galaxy-role', 'writable': True, 'label': 'Push your files to me', 'doc': 'This is an example of a writeable SSH dir', 'host': 'coolhost', 'user': 'user', 'passwd': 'passwd', 'timeout': 10, 'path': '/home/cooluser/', 'config_path': '', 'port': 2222}
+    {'type': 's3fs', 'label': 'My MinIO storage', 'endpoint_url': 'https://minio.usegalaxy.eu', 'id': 'galaxy-minio-storage', 'doc': 'Galaxy MinIO S3 storage', 'anon': False, 'secret': 'UHAJ6asd6asdhasd', 'key': 'MCJU76agdt98GGFAROIP7'}
+    {'type': 's3fs', 'label': 'Genome Ark', 'id': 'genomeark', 'doc': 'Access to Genome Ark open data on AWS.', 'bucket': 'genomeark', 'anon': True}
+    {'type': 's3fs', 'label': '1000 Genomes', 'id': '1000genomes', 'doc': 'Access to the 1000 Genomes Project with human genetic variation, including SNPs, structural variants, and their haplotype context.', 'bucket': '1000genomes', 'anon': True}
+    {'type': 's3fs', 'label': 'The Cancer Genome Atlas', 'id': 'tcga-2-open', 'doc': 'Access to the Cancer Genome Atlas (TCGA)', 'bucket': 'tcga-2-open', 'anon': True}
+    {'type': 's3fs', 'label': 'COVID-19 Data Lake', 'id': 'covid19-lake', 'doc': 'A centralized repository of up-to-date and curated datasets on or related to the spread and characteristics of the novel corona virus (SARS-CoV-2) and its associated illness, COVID-19', 'bucket': 'covid19-lake', 'anon': True}
+    {'type': 's3fs', 'label': 'Encyclopedia of DNA Elements (ENCODE)', 'id': 'encode-public', 'doc': 'The Encyclopedia of DNA Elements (ENCODE) Consortium is an international collaboration of research groups funded by the National Human Genome Research Institute (NHGRI)', 'bucket': 'encode-public', 'anon': True}
+    {'type': 's3fs', 'label': 'Sentinel-3', 'id': 'meeo-s3-nrt', 'doc': 'European Commission’s Copernicus Earth Observation Programme. Sentinel-3 is a polar orbiting satellite that completes 14 orbits of the Earth a day.', 'bucket': 'meeo-s3/NRT/', 'anon': True}
+    {'type': 's3fs', 'label': 'Sentinel-5P Level 2', 'id': 'meeo-s5p-nrti', 'doc': 'Observations from the Sentinel-5 Precursor satellite of the Copernicus Earth Observation Programme. It contains a polar orbiting satellite that completes 14 orbits of the Earth a day.', 'bucket': 'meeo-s5p/RPRO/', 'anon': True}
+    {'type': 's3fs', 'label': 'Coupled Model Intercomparison Project 6', 'id': 'esgf-world', 'doc': 'The sixth phase of global coupled ocean-atmosphere general circulation model ensemble', 'bucket': 'esgf-world', 'anon': True}
+    {'type': 's3fs', 'label': 'CMIP6 GCMs downscaled using WRF', 'id': 'wrf-cmip6-noversioning', 'doc': 'High-resolution historical and future climate simulations from 1980-2100', 'bucket': 'wrf-cmip6-noversioning', 'anon': True}
+    {'type': 's3fs', 'label': 'NOAA Global Forecast System (GFS)', 'id': 'noaa-gfs-bdp-pds', 'doc': 'The Global Forecast System (GFS) is a weather forecast model produced by the National Centers for Environmental Prediction (NCEP).', 'bucket': 'noaa-gfs-bdp-pds', 'anon': True}
+    {'type': 's3fs', 'label': 'NOAA Unified Forecast System Subseasonal to Seasonal Prototype 5', 'id': 'noaa-ufs-prototype5-pds', 'doc': 'The Unified Forecast System Subseasonal to Seasonal prototype 5 (UFS S2Sp5) dataset is reforecast data from the UFS atmosphere-ocean.', 'bucket': 'noaa-ufs-prototype5-pds', 'anon': True}
+    {'type': 's3fs', 'label': 'Copernicus Digital Elevation Model (DEM)', 'id': 'copernicus-dem-30m', 'doc': 'The Copernicus DEM is a Digital Surface Model (DSM) which represents the surface of the Earth including buildings, infrastructure and vegetation.', 'bucket': 'copernicus-dem-30m', 'anon': True}
+    {'type': 'http', 'label': 'Custom http filesource', 'id': 'httpcustom', 'url_regex': '^https?://myprotectedsite.org/', 'http_headers': {'Authorization': '#import base64\nBasic ${base64.b64encode(str.encode(user.preferences[\'myprotectedsite|username\'] + ":" + user.preferences[\'myprotectedsite|password\'])).decode()}'}, 'doc': 'Only define this if you want custom control over http downloads. You should also define a stock http source (below) or only downloads from this site will be allowed.'}
+    {'type': 'http', 'label': 'Stock http filesource', 'id': 'httpstock', 'doc': 'Make sure to define this generic http file source if you have defined any other http file sources, or stock http download capability will be disabled.'}
+    {'type': 'drs', 'label': 'Custom DRS filesource', 'id': 'drscustom', 'url_regex': '^drs://mydrssite.org/', 'http_headers': {'Authorization': '#import base64\nBasic ${base64.b64encode(str.encode(user.preferences[\'mydrssite|username\'] + ":" + user.preferences[\'mydrssite|password\'])).decode()}'}, 'doc': 'Define this if you want custom control over drs downloads. You should also define a stock drs source (below) or only downloads from this drs server will be allowed.'}
+    {'type': 'drs', 'label': 'Stock DRS filesource', 'id': 'drsstock', 'doc': 'Make sure to define this generic drs file source if you have defined any other drs file sources, or stock drs download capability will be disabled.'}
+    {'type': 'inveniordm', 'id': 'invenio_sandbox', 'doc': 'This is the Sandbox instance of Invenio. It is used for testing purposes only, content is NOT preserved. DOIs created in this instance are not real and will not resolve.', 'label': 'Invenio RDM Sandbox Repository (TESTING ONLY)', 'url': 'https://inveniordm.web.cern.ch/', 'token': "${user.user_vault.read_secret('preferences/invenio_sandbox/token')}", 'public_name': "${user.preferences['invenio_sandbox|public_name']}", 'writable': True}
+    {'type': 'zenodo', 'id': 'zenodo', 'doc': 'Zenodo is a general-purpose open-access repository developed under the European OpenAIRE program and operated by CERN. It allows researchers to deposit data sets, research software, reports, and any other research-related digital artifacts. For each submission, a persistent digital object identifier (DOI) is minted, which makes the stored items easily citeable.', 'label': 'Zenodo', 'url': 'https://zenodo.org', 'token': "${user.user_vault.read_secret('preferences/zenodo/token')}", 'public_name': "${user.preferences['zenodo|public_name']}", 'writable': True}
+    {'type': 'zenodo', 'id': 'zenodo_sandbox', 'doc': 'This is the Sandbox instance of Zenodo. It is used for testing purposes only, content is NOT preserved. DOIs created in this instance are not real and will not resolve.', 'label': 'Zenodo Sandbox (TESTING ONLY)', 'url': 'https://sandbox.zenodo.org', 'token': "${user.user_vault.read_secret('preferences/zenodo_sandbox/token')}", 'public_name': "${user.preferences['zenodo_sandbox|public_name']}", 'writable': True}
+    {'type': 'onedata', 'id': 'onedata1', 'label': 'Onedata', 'doc': 'Your Onedata files - configure an access token via user preferences', 'accessToken': "${user.preferences['onedata|access_token']}", 'onezoneDomain': "${user.preferences['onedata|onezone_domain']}", 'disableTlsCertificateValidation': "${user.preferences['onedata|disable_tls_certificate_validation']}"}
+
+
+
+config/galaxy.yml.sample:galaxy
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  mapping.galaxy.mapping.celery_conf.desc has changed from
+
+   ::
+
+    Configuration options passed to Celery.
+    
+    To refer to a task by name, use the template `galaxy.foo` where `foo` is the function name
+    of the task defined in the galaxy.celery.tasks module.
+    
+    The `broker_url` option, if unset, defaults to the value of `amqp_internal_connection`.
+    The `result_backend` option must be set if the `enable_celery_tasks` option is set.
+    
+    The galaxy.fetch_data task can be disabled by setting its route to "disabled": `galaxy.fetch_data: disabled`.
+    (Other tasks cannot be disabled on a per-task basis at this time.)
+    
+    For details, see Celery documentation at https://docs.celeryq.dev/en/stable/userguide/configuration.html.
+
+   to
+
+   ::
+
+    Configuration options passed to Celery.
+    
+    To refer to a task by name, use the template `galaxy.foo` where `foo` is the function name
+    of the task defined in the galaxy.celery.tasks module.
+    
+    The `broker_url` option, if unset or null, defaults to the value of `amqp_internal_connection`.
+    The `result_backend` option, if unset or null, defaults to an SQLite database at '<data_dir>/results.sqlite'
+    for storing task results. Please use a more robust backend (e.g. Redis) for production setups.
+    
+    The galaxy.fetch_data task can be disabled by setting its route to "disabled": `galaxy.fetch_data: disabled`.
+    (Other tasks cannot be disabled on a per-task basis at this time.)
+    
+    For details, see Celery documentation at https://docs.celeryq.dev/en/stable/userguide/configuration.html.
+
+
+-  mapping.galaxy.mapping.enable_celery_tasks.desc has changed from
+
+   ::
+
+    Offload long-running tasks to a Celery task queue.
+    Activate this only if you have setup a Celery worker for Galaxy.
+    For details, see https://docs.galaxyproject.org/en/master/admin/production.html
+
+   to
+
+   ::
+
+    Offload long-running tasks to a Celery task queue.
+    Activate this only if you have setup a Celery worker for Galaxy and you have
+    configured the `celery_conf` option below. Specifically, you need to set the
+    `result_backend` option in the `celery_conf` option to a valid Celery result
+    backend URL. By default, Galaxy uses an SQLite database at '<data_dir>/results.sqlite' for storing task results.
+    For details, see https://docs.galaxyproject.org/en/master/admin/production.html#use-celery-for-asynchronous-tasks
+
+
+-  mapping.galaxy.mapping.trs_servers_config_file.desc has changed from
+
+   ::
+
+    Allow import of workflows from the TRS servers configured in
+    the specified YAML or JSON file. The file should be a list with
+    'id', 'label', and 'api_url' for each entry. Optionally,
+    'link_url' and 'doc' may be be specified as well for each entry.
+    
+    If this is null (the default), a simple configuration containing
+    just Dockstore will be used.
+
+   to
+
+   ::
+
+    Allow import of workflows from the TRS servers configured in
+    the specified YAML or JSON file. The file should be a list with
+    'id', 'label', and 'api_url' for each entry. Optionally,
+    'link_url' and 'doc' may be specified as well for each entry.
+    
+    If this is null (the default), a simple configuration containing
+    just Dockstore will be used.
+
+
+Release Notes
+===========================================================
+
+.. include:: 24.1.rst
+   :start-after: announce_start
+
+.. include:: _thanks.rst
+
+Release Team
+===========================================================
+
+Release manager:  `John Davis <https://github.com/jdavcs>`__
+
+Release testing:
+
+* `Alireza Heidari <https://github.com/itisAliRH>`__
+* `Arash Kadkhodaei <https://github.com/arash77>`__
+* `Delphine Lariviere <https://github.com/Delphine-L>`__
+* `Jennifer Hillman-Jackson <https://github.com/jennaj>`__
+* `Marius van den Beek <https://github.com/mvdbeek>`__
+* `Saim Momin <https://github.com/SaimMomin12>`__
+* `Sebastian Schaaf <https://github.com/sebastian-schaaf>`__
+
+Communications:
+
+* `Natalie Whitaker-Allen <https://github.com/natwhitaker>`__
+
+A special thank you goes to everyone who helped test the new release after its deployment on usegalaxy.org.
diff --git a/doc/source/releases/24.1_announce_user.rst b/doc/source/releases/24.1_announce_user.rst
new file mode 100644
index 000000000000..c925b096a83f
--- /dev/null
+++ b/doc/source/releases/24.1_announce_user.rst
@@ -0,0 +1,192 @@
+
+===========================================================
+24.1 Galaxy Release (June 2024)
+===========================================================
+
+.. include:: _header.rst
+
+Highlights
+===========================================================
+
+Visualizing workflow runs with an invocation graph view
+-----------------------------------------------------------
+
+A graph view has been added to the workflow invocation summary. This feature uses the original workflow structure to display job states for each step on the workflow editor canvas. You can click on a step to expand and see detailed information about that invocation step.
+[`#17413 <https://github.com/galaxyproject/galaxy/pull/17413>`__]
+
+.. figure:: images/24.1-wf_graph.png
+   :alt: Workflow card view.
+
+.. raw:: html
+
+   <iframe width="560" height="315" src="https://www.youtube.com/embed/TlDnoZxWh5E" title="Galaxy 24.1 - Workflow invocation graph view" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+Workflow editor undo/redo
+-----------------------------------------------------------
+
+Undo/redo functionality has been added to the workflow editor, enhancing the user experience and workflow management. Here's how it works:
+
+- Action Class Instances: The system uses a store to manage undo and redo stacks of action class instances. These instances encapsulate bi-directional state changes.
+- Granular Undo-Redo: All user actions in the workflow editor are now managed by these action classes, allowing for granular undo and redo of workflow modifications.
+- Continuous State-Changes: For continuous state changes (like moving a node or typing text), changes are stored every second or when another change occurs.
+
+This system provides users with more control over their workflow editing process, allowing them to undo and redo changes in a detailed and efficient manner.
+[`#17774 <https://github.com/galaxyproject/galaxy/pull/17774>`__]
+
+.. raw:: html
+
+   <iframe width="560" height="315" src="https://www.youtube.com/embed/G_X7nJ73Fos" title="Galaxy 24.1 - Worfklow editor undo/redo" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+Select multiple items in workflow editor
+-----------------------------------------------------------
+
+New selection features in the Workflow Editor have been introduced to improve workflow management:
+
+- Shift-Select: You can now shift-select multiple steps or comments, allowing for easier grouping and manipulation of workflow elements.
+- Box Selection Editor Tool: This tool enables you to add or remove items from the selection by dragging a box around them. This feature is useful for quickly selecting multiple items.
+- Group Actions: Selected items can be moved together, deleted, and duplicated, streamlining workflow editing tasks.
+- Default Selection for Imported and Duplicated Items: Items imported from other workflows and newly duplicated items are now selected by default. This makes it easier to reposition them within the workflow.
+
+These enhancements simplify the process of selecting and managing multiple elements in the Workflow Editor, improving the overall editing experience.
+[`#17615 <https://github.com/galaxyproject/galaxy/pull/17615>`__]
+
+.. figure:: images/24.1-wf_selection.png
+   :alt: Select multiple items in workflow editor.
+
+All-vs-all collection analysis patterns
+-----------------------------------------------------------
+
+Galaxy now matches corresponding datasets when multiple collections are used to map over a tool, akin to a dot product pattern. This feature can be adapted for all-vs-all mapping by first creating two new input collections containing the Cartesian product (in math terms) or Cross Join (in SQL terms) of the inputs. These collections align every combination of elements between the first and second lists, enhancing flexibility in dataset mapping.
+[`#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`__]
+
+Pagination support added to files source plugins
+-----------------------------------------------------------
+
+To improve navigation of remote file sources potentially containing vast numbers of files, server-side pagination support has been added to file source plugins. Plugins can now support server-side pagination, searching and sorting, which is indicated by corresponding serializable properties and is implemented on a per-plugin basis. See PyFilesystem2-based and Invenio-based plugins for implementation details.
+[`#18059 <https://github.com/galaxyproject/galaxy/pull/18059>`__]
+
+.. figure:: images/24.1-pagination.gif
+   :alt: Pagination support for file source plugins.
+
+Zenodo integration
+-----------------------------------------------------------
+
+A new Zenodo file source plugin based on Invenio has been added, making integration more straightforward. This update also introduces new schemes (invenio:// and zenodo://) for Invenio and Zenodo file sources, respectively, aligning them with their intended conventions. Existing exports using the gxfiles:// scheme will continue to work as expected.
+[`#18022 <https://github.com/galaxyproject/galaxy/pull/18022>`__]
+
+.. figure:: images/24.1-zenodo.png
+   :alt: Zenodo integration.
+
+Document Object Identifiers displayed in archived histories
+-----------------------------------------------------------
+
+Histories that have been archived and preserved in an external repository like Zenodo will now display their Document Object Identifier (DOI). This change enhances the clarity and accessibility of archived histories.
+[`#18134 <https://github.com/galaxyproject/galaxy/pull/18134>`__]
+
+.. figure:: images/24.1-doi.png
+   :alt: DOI displayed in archived histories.
+
+Activity bar is now enabled by default
+-----------------------------------------------------------
+
+Activity bar is now enabled by default, which enhances the user experience by providing quick access to essential features and improving workflow navigation.
+[`#17531 <https://github.com/galaxyproject/galaxy/pull/17531>`__]
+
+Visualizations
+===========================================================
+
+.. visualizations
+* Check various preconditions in FeatureLocationIndexDataProvider
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18283`_
+* Add pinia to manually mounted vue components
+  (thanks to `@guerler <https://github.com/guerler>`__).
+  `Pull Request 18299`_
+* Update parcel-built visualizations to use parcel v2
+  (thanks to `@dannon <https://github.com/dannon>`__).
+  `Pull Request 18311`_
+* Fix visualizations compatible dataset filtering
+  (thanks to `@davelopez <https://github.com/davelopez>`__).
+  `Pull Request 18343`_
+* Fix pca 3d rendering of tabular files and visualization error handling in general
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18211`_
+
+Datatypes
+===========================================================
+
+.. datatypes
+* Tighten axt sniffer
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18204`_
+* Don't set dataset peek for errored jobs
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18231`_
+* Better display of estimated line numbers and add number of columns for tabular
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17492`_
+* Add colabfold tar file datatype
+  (thanks to `@astrovsky01 <https://github.com/astrovsky01>`__).
+  `Pull Request 17567`_
+* Set minimal metadata also for empty bed datasets
+  (thanks to `@wm75 <https://github.com/wm75>`__).
+  `Pull Request 17586`_
+* Code cleanups from ruff and pyupgrade
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17654`_
+* Npz sniffing: do not read the whole file
+  (thanks to `@bernt-matthias <https://github.com/bernt-matthias>`__).
+  `Pull Request 17672`_
+* Never fail dataset serialization if display_peek fails
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 17937`_
+* Enable ``warn_unused_ignores`` mypy option
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17991`_
+* Add support for additional media types
+  (thanks to `@arash77 <https://github.com/arash77>`__).
+  `Pull Request 18054`_
+* Enable flake8-implicit-str-concat ruff rules
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18067`_
+* Chore: remove repetitive words
+  (thanks to `@tianzedavid <https://github.com/tianzedavid>`__).
+  `Pull Request 18076`_
+* Add Net datatype
+  (thanks to `@martenson <https://github.com/martenson>`__).
+  `Pull Request 18080`_
+
+Builtin Tool Updates
+===========================================================
+
+.. tools
+* Raise exception when extracting dataset from collection without datasets
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18249`_
+* Backport Qiskit Jupyter Notebook update to 24.1
+  (thanks to `@natefoo <https://github.com/natefoo>`__).
+  `Pull Request 18310`_
+* Fix null inputs in database operation tools
+  (thanks to `@mvdbeek <https://github.com/mvdbeek>`__).
+  `Pull Request 18385`_
+* Code cleanups from ruff and pyupgrade
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17654`_
+* Rename JupyTool to something more searchable (i.e. JupyterLab which includes the substring Jupyter)
+  (thanks to `@hexylena <https://github.com/hexylena>`__).
+  `Pull Request 17849`_
+* Enable ``warn_unused_ignores`` mypy option
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 17991`_
+* Enable flake8-implicit-str-concat ruff rules
+  (thanks to `@nsoranzo <https://github.com/nsoranzo>`__).
+  `Pull Request 18067`_
+
+Release Notes
+===========================================================
+
+Please see the :doc:`full release notes <24.1_announce>` for more details.
+
+.. include:: 24.1_prs.rst
+
+.. include:: _thanks.rst
diff --git a/doc/source/releases/24.1_prs.rst b/doc/source/releases/24.1_prs.rst
new file mode 100644
index 000000000000..e18bb82edf5b
--- /dev/null
+++ b/doc/source/releases/24.1_prs.rst
@@ -0,0 +1,323 @@
+
+.. github_links
+.. _Pull Request 18218: https://github.com/galaxyproject/galaxy/pull/18218
+.. _Pull Request 18423: https://github.com/galaxyproject/galaxy/pull/18423
+.. _Pull Request 17818: https://github.com/galaxyproject/galaxy/pull/17818
+.. _Pull Request 18192: https://github.com/galaxyproject/galaxy/pull/18192
+.. _Pull Request 18199: https://github.com/galaxyproject/galaxy/pull/18199
+.. _Pull Request 18204: https://github.com/galaxyproject/galaxy/pull/18204
+.. _Pull Request 18212: https://github.com/galaxyproject/galaxy/pull/18212
+.. _Pull Request 18214: https://github.com/galaxyproject/galaxy/pull/18214
+.. _Pull Request 18217: https://github.com/galaxyproject/galaxy/pull/18217
+.. _Pull Request 18223: https://github.com/galaxyproject/galaxy/pull/18223
+.. _Pull Request 18230: https://github.com/galaxyproject/galaxy/pull/18230
+.. _Pull Request 18231: https://github.com/galaxyproject/galaxy/pull/18231
+.. _Pull Request 18233: https://github.com/galaxyproject/galaxy/pull/18233
+.. _Pull Request 18234: https://github.com/galaxyproject/galaxy/pull/18234
+.. _Pull Request 18235: https://github.com/galaxyproject/galaxy/pull/18235
+.. _Pull Request 18236: https://github.com/galaxyproject/galaxy/pull/18236
+.. _Pull Request 18239: https://github.com/galaxyproject/galaxy/pull/18239
+.. _Pull Request 18243: https://github.com/galaxyproject/galaxy/pull/18243
+.. _Pull Request 18244: https://github.com/galaxyproject/galaxy/pull/18244
+.. _Pull Request 18246: https://github.com/galaxyproject/galaxy/pull/18246
+.. _Pull Request 18247: https://github.com/galaxyproject/galaxy/pull/18247
+.. _Pull Request 18248: https://github.com/galaxyproject/galaxy/pull/18248
+.. _Pull Request 18249: https://github.com/galaxyproject/galaxy/pull/18249
+.. _Pull Request 18250: https://github.com/galaxyproject/galaxy/pull/18250
+.. _Pull Request 18251: https://github.com/galaxyproject/galaxy/pull/18251
+.. _Pull Request 18252: https://github.com/galaxyproject/galaxy/pull/18252
+.. _Pull Request 18255: https://github.com/galaxyproject/galaxy/pull/18255
+.. _Pull Request 18263: https://github.com/galaxyproject/galaxy/pull/18263
+.. _Pull Request 18267: https://github.com/galaxyproject/galaxy/pull/18267
+.. _Pull Request 18270: https://github.com/galaxyproject/galaxy/pull/18270
+.. _Pull Request 18273: https://github.com/galaxyproject/galaxy/pull/18273
+.. _Pull Request 18274: https://github.com/galaxyproject/galaxy/pull/18274
+.. _Pull Request 18278: https://github.com/galaxyproject/galaxy/pull/18278
+.. _Pull Request 18283: https://github.com/galaxyproject/galaxy/pull/18283
+.. _Pull Request 18284: https://github.com/galaxyproject/galaxy/pull/18284
+.. _Pull Request 18286: https://github.com/galaxyproject/galaxy/pull/18286
+.. _Pull Request 18289: https://github.com/galaxyproject/galaxy/pull/18289
+.. _Pull Request 18291: https://github.com/galaxyproject/galaxy/pull/18291
+.. _Pull Request 18294: https://github.com/galaxyproject/galaxy/pull/18294
+.. _Pull Request 18296: https://github.com/galaxyproject/galaxy/pull/18296
+.. _Pull Request 18299: https://github.com/galaxyproject/galaxy/pull/18299
+.. _Pull Request 18301: https://github.com/galaxyproject/galaxy/pull/18301
+.. _Pull Request 18303: https://github.com/galaxyproject/galaxy/pull/18303
+.. _Pull Request 18305: https://github.com/galaxyproject/galaxy/pull/18305
+.. _Pull Request 18306: https://github.com/galaxyproject/galaxy/pull/18306
+.. _Pull Request 18307: https://github.com/galaxyproject/galaxy/pull/18307
+.. _Pull Request 18308: https://github.com/galaxyproject/galaxy/pull/18308
+.. _Pull Request 18309: https://github.com/galaxyproject/galaxy/pull/18309
+.. _Pull Request 18310: https://github.com/galaxyproject/galaxy/pull/18310
+.. _Pull Request 18311: https://github.com/galaxyproject/galaxy/pull/18311
+.. _Pull Request 18313: https://github.com/galaxyproject/galaxy/pull/18313
+.. _Pull Request 18314: https://github.com/galaxyproject/galaxy/pull/18314
+.. _Pull Request 18315: https://github.com/galaxyproject/galaxy/pull/18315
+.. _Pull Request 18324: https://github.com/galaxyproject/galaxy/pull/18324
+.. _Pull Request 18325: https://github.com/galaxyproject/galaxy/pull/18325
+.. _Pull Request 18329: https://github.com/galaxyproject/galaxy/pull/18329
+.. _Pull Request 18330: https://github.com/galaxyproject/galaxy/pull/18330
+.. _Pull Request 18333: https://github.com/galaxyproject/galaxy/pull/18333
+.. _Pull Request 18338: https://github.com/galaxyproject/galaxy/pull/18338
+.. _Pull Request 18339: https://github.com/galaxyproject/galaxy/pull/18339
+.. _Pull Request 18342: https://github.com/galaxyproject/galaxy/pull/18342
+.. _Pull Request 18343: https://github.com/galaxyproject/galaxy/pull/18343
+.. _Pull Request 18344: https://github.com/galaxyproject/galaxy/pull/18344
+.. _Pull Request 18348: https://github.com/galaxyproject/galaxy/pull/18348
+.. _Pull Request 18352: https://github.com/galaxyproject/galaxy/pull/18352
+.. _Pull Request 18353: https://github.com/galaxyproject/galaxy/pull/18353
+.. _Pull Request 18358: https://github.com/galaxyproject/galaxy/pull/18358
+.. _Pull Request 18364: https://github.com/galaxyproject/galaxy/pull/18364
+.. _Pull Request 18365: https://github.com/galaxyproject/galaxy/pull/18365
+.. _Pull Request 18370: https://github.com/galaxyproject/galaxy/pull/18370
+.. _Pull Request 18372: https://github.com/galaxyproject/galaxy/pull/18372
+.. _Pull Request 18374: https://github.com/galaxyproject/galaxy/pull/18374
+.. _Pull Request 18376: https://github.com/galaxyproject/galaxy/pull/18376
+.. _Pull Request 18377: https://github.com/galaxyproject/galaxy/pull/18377
+.. _Pull Request 18378: https://github.com/galaxyproject/galaxy/pull/18378
+.. _Pull Request 18379: https://github.com/galaxyproject/galaxy/pull/18379
+.. _Pull Request 18381: https://github.com/galaxyproject/galaxy/pull/18381
+.. _Pull Request 18385: https://github.com/galaxyproject/galaxy/pull/18385
+.. _Pull Request 18387: https://github.com/galaxyproject/galaxy/pull/18387
+.. _Pull Request 18388: https://github.com/galaxyproject/galaxy/pull/18388
+.. _Pull Request 18389: https://github.com/galaxyproject/galaxy/pull/18389
+.. _Pull Request 18390: https://github.com/galaxyproject/galaxy/pull/18390
+.. _Pull Request 18393: https://github.com/galaxyproject/galaxy/pull/18393
+.. _Pull Request 18395: https://github.com/galaxyproject/galaxy/pull/18395
+.. _Pull Request 18396: https://github.com/galaxyproject/galaxy/pull/18396
+.. _Pull Request 18400: https://github.com/galaxyproject/galaxy/pull/18400
+.. _Pull Request 18402: https://github.com/galaxyproject/galaxy/pull/18402
+.. _Pull Request 18403: https://github.com/galaxyproject/galaxy/pull/18403
+.. _Pull Request 18405: https://github.com/galaxyproject/galaxy/pull/18405
+.. _Pull Request 18410: https://github.com/galaxyproject/galaxy/pull/18410
+.. _Pull Request 18411: https://github.com/galaxyproject/galaxy/pull/18411
+.. _Pull Request 18416: https://github.com/galaxyproject/galaxy/pull/18416
+.. _Pull Request 18418: https://github.com/galaxyproject/galaxy/pull/18418
+.. _Pull Request 18420: https://github.com/galaxyproject/galaxy/pull/18420
+.. _Pull Request 16645: https://github.com/galaxyproject/galaxy/pull/16645
+.. _Pull Request 16730: https://github.com/galaxyproject/galaxy/pull/16730
+.. _Pull Request 16983: https://github.com/galaxyproject/galaxy/pull/16983
+.. _Pull Request 17225: https://github.com/galaxyproject/galaxy/pull/17225
+.. _Pull Request 17366: https://github.com/galaxyproject/galaxy/pull/17366
+.. _Pull Request 17413: https://github.com/galaxyproject/galaxy/pull/17413
+.. _Pull Request 17424: https://github.com/galaxyproject/galaxy/pull/17424
+.. _Pull Request 17492: https://github.com/galaxyproject/galaxy/pull/17492
+.. _Pull Request 17500: https://github.com/galaxyproject/galaxy/pull/17500
+.. _Pull Request 17531: https://github.com/galaxyproject/galaxy/pull/17531
+.. _Pull Request 17540: https://github.com/galaxyproject/galaxy/pull/17540
+.. _Pull Request 17555: https://github.com/galaxyproject/galaxy/pull/17555
+.. _Pull Request 17564: https://github.com/galaxyproject/galaxy/pull/17564
+.. _Pull Request 17567: https://github.com/galaxyproject/galaxy/pull/17567
+.. _Pull Request 17571: https://github.com/galaxyproject/galaxy/pull/17571
+.. _Pull Request 17581: https://github.com/galaxyproject/galaxy/pull/17581
+.. _Pull Request 17585: https://github.com/galaxyproject/galaxy/pull/17585
+.. _Pull Request 17586: https://github.com/galaxyproject/galaxy/pull/17586
+.. _Pull Request 17592: https://github.com/galaxyproject/galaxy/pull/17592
+.. _Pull Request 17593: https://github.com/galaxyproject/galaxy/pull/17593
+.. _Pull Request 17596: https://github.com/galaxyproject/galaxy/pull/17596
+.. _Pull Request 17601: https://github.com/galaxyproject/galaxy/pull/17601
+.. _Pull Request 17607: https://github.com/galaxyproject/galaxy/pull/17607
+.. _Pull Request 17615: https://github.com/galaxyproject/galaxy/pull/17615
+.. _Pull Request 17630: https://github.com/galaxyproject/galaxy/pull/17630
+.. _Pull Request 17647: https://github.com/galaxyproject/galaxy/pull/17647
+.. _Pull Request 17653: https://github.com/galaxyproject/galaxy/pull/17653
+.. _Pull Request 17654: https://github.com/galaxyproject/galaxy/pull/17654
+.. _Pull Request 17655: https://github.com/galaxyproject/galaxy/pull/17655
+.. _Pull Request 17656: https://github.com/galaxyproject/galaxy/pull/17656
+.. _Pull Request 17672: https://github.com/galaxyproject/galaxy/pull/17672
+.. _Pull Request 17680: https://github.com/galaxyproject/galaxy/pull/17680
+.. _Pull Request 17686: https://github.com/galaxyproject/galaxy/pull/17686
+.. _Pull Request 17693: https://github.com/galaxyproject/galaxy/pull/17693
+.. _Pull Request 17696: https://github.com/galaxyproject/galaxy/pull/17696
+.. _Pull Request 17701: https://github.com/galaxyproject/galaxy/pull/17701
+.. _Pull Request 17748: https://github.com/galaxyproject/galaxy/pull/17748
+.. _Pull Request 17749: https://github.com/galaxyproject/galaxy/pull/17749
+.. _Pull Request 17752: https://github.com/galaxyproject/galaxy/pull/17752
+.. _Pull Request 17754: https://github.com/galaxyproject/galaxy/pull/17754
+.. _Pull Request 17764: https://github.com/galaxyproject/galaxy/pull/17764
+.. _Pull Request 17766: https://github.com/galaxyproject/galaxy/pull/17766
+.. _Pull Request 17774: https://github.com/galaxyproject/galaxy/pull/17774
+.. _Pull Request 17778: https://github.com/galaxyproject/galaxy/pull/17778
+.. _Pull Request 17797: https://github.com/galaxyproject/galaxy/pull/17797
+.. _Pull Request 17799: https://github.com/galaxyproject/galaxy/pull/17799
+.. _Pull Request 17802: https://github.com/galaxyproject/galaxy/pull/17802
+.. _Pull Request 17804: https://github.com/galaxyproject/galaxy/pull/17804
+.. _Pull Request 17810: https://github.com/galaxyproject/galaxy/pull/17810
+.. _Pull Request 17819: https://github.com/galaxyproject/galaxy/pull/17819
+.. _Pull Request 17820: https://github.com/galaxyproject/galaxy/pull/17820
+.. _Pull Request 17824: https://github.com/galaxyproject/galaxy/pull/17824
+.. _Pull Request 17833: https://github.com/galaxyproject/galaxy/pull/17833
+.. _Pull Request 17839: https://github.com/galaxyproject/galaxy/pull/17839
+.. _Pull Request 17840: https://github.com/galaxyproject/galaxy/pull/17840
+.. _Pull Request 17849: https://github.com/galaxyproject/galaxy/pull/17849
+.. _Pull Request 17850: https://github.com/galaxyproject/galaxy/pull/17850
+.. _Pull Request 17853: https://github.com/galaxyproject/galaxy/pull/17853
+.. _Pull Request 17858: https://github.com/galaxyproject/galaxy/pull/17858
+.. _Pull Request 17863: https://github.com/galaxyproject/galaxy/pull/17863
+.. _Pull Request 17866: https://github.com/galaxyproject/galaxy/pull/17866
+.. _Pull Request 17867: https://github.com/galaxyproject/galaxy/pull/17867
+.. _Pull Request 17869: https://github.com/galaxyproject/galaxy/pull/17869
+.. _Pull Request 17870: https://github.com/galaxyproject/galaxy/pull/17870
+.. _Pull Request 17872: https://github.com/galaxyproject/galaxy/pull/17872
+.. _Pull Request 17877: https://github.com/galaxyproject/galaxy/pull/17877
+.. _Pull Request 17886: https://github.com/galaxyproject/galaxy/pull/17886
+.. _Pull Request 17888: https://github.com/galaxyproject/galaxy/pull/17888
+.. _Pull Request 17890: https://github.com/galaxyproject/galaxy/pull/17890
+.. _Pull Request 17892: https://github.com/galaxyproject/galaxy/pull/17892
+.. _Pull Request 17894: https://github.com/galaxyproject/galaxy/pull/17894
+.. _Pull Request 17896: https://github.com/galaxyproject/galaxy/pull/17896
+.. _Pull Request 17898: https://github.com/galaxyproject/galaxy/pull/17898
+.. _Pull Request 17899: https://github.com/galaxyproject/galaxy/pull/17899
+.. _Pull Request 17902: https://github.com/galaxyproject/galaxy/pull/17902
+.. _Pull Request 17904: https://github.com/galaxyproject/galaxy/pull/17904
+.. _Pull Request 17905: https://github.com/galaxyproject/galaxy/pull/17905
+.. _Pull Request 17907: https://github.com/galaxyproject/galaxy/pull/17907
+.. _Pull Request 17913: https://github.com/galaxyproject/galaxy/pull/17913
+.. _Pull Request 17914: https://github.com/galaxyproject/galaxy/pull/17914
+.. _Pull Request 17915: https://github.com/galaxyproject/galaxy/pull/17915
+.. _Pull Request 17917: https://github.com/galaxyproject/galaxy/pull/17917
+.. _Pull Request 17918: https://github.com/galaxyproject/galaxy/pull/17918
+.. _Pull Request 17919: https://github.com/galaxyproject/galaxy/pull/17919
+.. _Pull Request 17922: https://github.com/galaxyproject/galaxy/pull/17922
+.. _Pull Request 17923: https://github.com/galaxyproject/galaxy/pull/17923
+.. _Pull Request 17924: https://github.com/galaxyproject/galaxy/pull/17924
+.. _Pull Request 17925: https://github.com/galaxyproject/galaxy/pull/17925
+.. _Pull Request 17926: https://github.com/galaxyproject/galaxy/pull/17926
+.. _Pull Request 17929: https://github.com/galaxyproject/galaxy/pull/17929
+.. _Pull Request 17930: https://github.com/galaxyproject/galaxy/pull/17930
+.. _Pull Request 17931: https://github.com/galaxyproject/galaxy/pull/17931
+.. _Pull Request 17932: https://github.com/galaxyproject/galaxy/pull/17932
+.. _Pull Request 17937: https://github.com/galaxyproject/galaxy/pull/17937
+.. _Pull Request 17939: https://github.com/galaxyproject/galaxy/pull/17939
+.. _Pull Request 17949: https://github.com/galaxyproject/galaxy/pull/17949
+.. _Pull Request 17952: https://github.com/galaxyproject/galaxy/pull/17952
+.. _Pull Request 17958: https://github.com/galaxyproject/galaxy/pull/17958
+.. _Pull Request 17964: https://github.com/galaxyproject/galaxy/pull/17964
+.. _Pull Request 17968: https://github.com/galaxyproject/galaxy/pull/17968
+.. _Pull Request 17969: https://github.com/galaxyproject/galaxy/pull/17969
+.. _Pull Request 17971: https://github.com/galaxyproject/galaxy/pull/17971
+.. _Pull Request 17974: https://github.com/galaxyproject/galaxy/pull/17974
+.. _Pull Request 17975: https://github.com/galaxyproject/galaxy/pull/17975
+.. _Pull Request 17976: https://github.com/galaxyproject/galaxy/pull/17976
+.. _Pull Request 17980: https://github.com/galaxyproject/galaxy/pull/17980
+.. _Pull Request 17981: https://github.com/galaxyproject/galaxy/pull/17981
+.. _Pull Request 17982: https://github.com/galaxyproject/galaxy/pull/17982
+.. _Pull Request 17983: https://github.com/galaxyproject/galaxy/pull/17983
+.. _Pull Request 17985: https://github.com/galaxyproject/galaxy/pull/17985
+.. _Pull Request 17987: https://github.com/galaxyproject/galaxy/pull/17987
+.. _Pull Request 17988: https://github.com/galaxyproject/galaxy/pull/17988
+.. _Pull Request 17991: https://github.com/galaxyproject/galaxy/pull/17991
+.. _Pull Request 17992: https://github.com/galaxyproject/galaxy/pull/17992
+.. _Pull Request 18000: https://github.com/galaxyproject/galaxy/pull/18000
+.. _Pull Request 18002: https://github.com/galaxyproject/galaxy/pull/18002
+.. _Pull Request 18003: https://github.com/galaxyproject/galaxy/pull/18003
+.. _Pull Request 18005: https://github.com/galaxyproject/galaxy/pull/18005
+.. _Pull Request 18007: https://github.com/galaxyproject/galaxy/pull/18007
+.. _Pull Request 18008: https://github.com/galaxyproject/galaxy/pull/18008
+.. _Pull Request 18009: https://github.com/galaxyproject/galaxy/pull/18009
+.. _Pull Request 18010: https://github.com/galaxyproject/galaxy/pull/18010
+.. _Pull Request 18011: https://github.com/galaxyproject/galaxy/pull/18011
+.. _Pull Request 18014: https://github.com/galaxyproject/galaxy/pull/18014
+.. _Pull Request 18016: https://github.com/galaxyproject/galaxy/pull/18016
+.. _Pull Request 18018: https://github.com/galaxyproject/galaxy/pull/18018
+.. _Pull Request 18020: https://github.com/galaxyproject/galaxy/pull/18020
+.. _Pull Request 18021: https://github.com/galaxyproject/galaxy/pull/18021
+.. _Pull Request 18022: https://github.com/galaxyproject/galaxy/pull/18022
+.. _Pull Request 18023: https://github.com/galaxyproject/galaxy/pull/18023
+.. _Pull Request 18025: https://github.com/galaxyproject/galaxy/pull/18025
+.. _Pull Request 18026: https://github.com/galaxyproject/galaxy/pull/18026
+.. _Pull Request 18028: https://github.com/galaxyproject/galaxy/pull/18028
+.. _Pull Request 18033: https://github.com/galaxyproject/galaxy/pull/18033
+.. _Pull Request 18034: https://github.com/galaxyproject/galaxy/pull/18034
+.. _Pull Request 18035: https://github.com/galaxyproject/galaxy/pull/18035
+.. _Pull Request 18036: https://github.com/galaxyproject/galaxy/pull/18036
+.. _Pull Request 18037: https://github.com/galaxyproject/galaxy/pull/18037
+.. _Pull Request 18038: https://github.com/galaxyproject/galaxy/pull/18038
+.. _Pull Request 18039: https://github.com/galaxyproject/galaxy/pull/18039
+.. _Pull Request 18040: https://github.com/galaxyproject/galaxy/pull/18040
+.. _Pull Request 18044: https://github.com/galaxyproject/galaxy/pull/18044
+.. _Pull Request 18046: https://github.com/galaxyproject/galaxy/pull/18046
+.. _Pull Request 18049: https://github.com/galaxyproject/galaxy/pull/18049
+.. _Pull Request 18050: https://github.com/galaxyproject/galaxy/pull/18050
+.. _Pull Request 18054: https://github.com/galaxyproject/galaxy/pull/18054
+.. _Pull Request 18059: https://github.com/galaxyproject/galaxy/pull/18059
+.. _Pull Request 18060: https://github.com/galaxyproject/galaxy/pull/18060
+.. _Pull Request 18063: https://github.com/galaxyproject/galaxy/pull/18063
+.. _Pull Request 18065: https://github.com/galaxyproject/galaxy/pull/18065
+.. _Pull Request 18067: https://github.com/galaxyproject/galaxy/pull/18067
+.. _Pull Request 18070: https://github.com/galaxyproject/galaxy/pull/18070
+.. _Pull Request 18071: https://github.com/galaxyproject/galaxy/pull/18071
+.. _Pull Request 18074: https://github.com/galaxyproject/galaxy/pull/18074
+.. _Pull Request 18076: https://github.com/galaxyproject/galaxy/pull/18076
+.. _Pull Request 18079: https://github.com/galaxyproject/galaxy/pull/18079
+.. _Pull Request 18080: https://github.com/galaxyproject/galaxy/pull/18080
+.. _Pull Request 18084: https://github.com/galaxyproject/galaxy/pull/18084
+.. _Pull Request 18085: https://github.com/galaxyproject/galaxy/pull/18085
+.. _Pull Request 18086: https://github.com/galaxyproject/galaxy/pull/18086
+.. _Pull Request 18087: https://github.com/galaxyproject/galaxy/pull/18087
+.. _Pull Request 18088: https://github.com/galaxyproject/galaxy/pull/18088
+.. _Pull Request 18094: https://github.com/galaxyproject/galaxy/pull/18094
+.. _Pull Request 18095: https://github.com/galaxyproject/galaxy/pull/18095
+.. _Pull Request 18099: https://github.com/galaxyproject/galaxy/pull/18099
+.. _Pull Request 18100: https://github.com/galaxyproject/galaxy/pull/18100
+.. _Pull Request 18103: https://github.com/galaxyproject/galaxy/pull/18103
+.. _Pull Request 18106: https://github.com/galaxyproject/galaxy/pull/18106
+.. _Pull Request 18107: https://github.com/galaxyproject/galaxy/pull/18107
+.. _Pull Request 18108: https://github.com/galaxyproject/galaxy/pull/18108
+.. _Pull Request 18109: https://github.com/galaxyproject/galaxy/pull/18109
+.. _Pull Request 18110: https://github.com/galaxyproject/galaxy/pull/18110
+.. _Pull Request 18112: https://github.com/galaxyproject/galaxy/pull/18112
+.. _Pull Request 18115: https://github.com/galaxyproject/galaxy/pull/18115
+.. _Pull Request 18118: https://github.com/galaxyproject/galaxy/pull/18118
+.. _Pull Request 18119: https://github.com/galaxyproject/galaxy/pull/18119
+.. _Pull Request 18120: https://github.com/galaxyproject/galaxy/pull/18120
+.. _Pull Request 18121: https://github.com/galaxyproject/galaxy/pull/18121
+.. _Pull Request 18122: https://github.com/galaxyproject/galaxy/pull/18122
+.. _Pull Request 18123: https://github.com/galaxyproject/galaxy/pull/18123
+.. _Pull Request 18124: https://github.com/galaxyproject/galaxy/pull/18124
+.. _Pull Request 18125: https://github.com/galaxyproject/galaxy/pull/18125
+.. _Pull Request 18126: https://github.com/galaxyproject/galaxy/pull/18126
+.. _Pull Request 18127: https://github.com/galaxyproject/galaxy/pull/18127
+.. _Pull Request 18130: https://github.com/galaxyproject/galaxy/pull/18130
+.. _Pull Request 18131: https://github.com/galaxyproject/galaxy/pull/18131
+.. _Pull Request 18132: https://github.com/galaxyproject/galaxy/pull/18132
+.. _Pull Request 18134: https://github.com/galaxyproject/galaxy/pull/18134
+.. _Pull Request 18135: https://github.com/galaxyproject/galaxy/pull/18135
+.. _Pull Request 18136: https://github.com/galaxyproject/galaxy/pull/18136
+.. _Pull Request 18137: https://github.com/galaxyproject/galaxy/pull/18137
+.. _Pull Request 18141: https://github.com/galaxyproject/galaxy/pull/18141
+.. _Pull Request 18143: https://github.com/galaxyproject/galaxy/pull/18143
+.. _Pull Request 18145: https://github.com/galaxyproject/galaxy/pull/18145
+.. _Pull Request 18151: https://github.com/galaxyproject/galaxy/pull/18151
+.. _Pull Request 18155: https://github.com/galaxyproject/galaxy/pull/18155
+.. _Pull Request 18156: https://github.com/galaxyproject/galaxy/pull/18156
+.. _Pull Request 18169: https://github.com/galaxyproject/galaxy/pull/18169
+.. _Pull Request 18170: https://github.com/galaxyproject/galaxy/pull/18170
+.. _Pull Request 18172: https://github.com/galaxyproject/galaxy/pull/18172
+.. _Pull Request 18173: https://github.com/galaxyproject/galaxy/pull/18173
+.. _Pull Request 18174: https://github.com/galaxyproject/galaxy/pull/18174
+.. _Pull Request 18175: https://github.com/galaxyproject/galaxy/pull/18175
+.. _Pull Request 18178: https://github.com/galaxyproject/galaxy/pull/18178
+.. _Pull Request 18179: https://github.com/galaxyproject/galaxy/pull/18179
+.. _Pull Request 18180: https://github.com/galaxyproject/galaxy/pull/18180
+.. _Pull Request 18181: https://github.com/galaxyproject/galaxy/pull/18181
+.. _Pull Request 18182: https://github.com/galaxyproject/galaxy/pull/18182
+.. _Pull Request 18183: https://github.com/galaxyproject/galaxy/pull/18183
+.. _Pull Request 18184: https://github.com/galaxyproject/galaxy/pull/18184
+.. _Pull Request 18185: https://github.com/galaxyproject/galaxy/pull/18185
+.. _Pull Request 18186: https://github.com/galaxyproject/galaxy/pull/18186
+.. _Pull Request 18187: https://github.com/galaxyproject/galaxy/pull/18187
+.. _Pull Request 18188: https://github.com/galaxyproject/galaxy/pull/18188
+.. _Pull Request 18190: https://github.com/galaxyproject/galaxy/pull/18190
+.. _Pull Request 18191: https://github.com/galaxyproject/galaxy/pull/18191
+.. _Pull Request 18193: https://github.com/galaxyproject/galaxy/pull/18193
+.. _Pull Request 18194: https://github.com/galaxyproject/galaxy/pull/18194
+.. _Pull Request 18200: https://github.com/galaxyproject/galaxy/pull/18200
+.. _Pull Request 18201: https://github.com/galaxyproject/galaxy/pull/18201
+.. _Pull Request 18202: https://github.com/galaxyproject/galaxy/pull/18202
+.. _Pull Request 18203: https://github.com/galaxyproject/galaxy/pull/18203
+.. _Pull Request 18206: https://github.com/galaxyproject/galaxy/pull/18206
+.. _Pull Request 18207: https://github.com/galaxyproject/galaxy/pull/18207
+.. _Pull Request 18208: https://github.com/galaxyproject/galaxy/pull/18208
+.. _Pull Request 18211: https://github.com/galaxyproject/galaxy/pull/18211
+.. _Pull Request 18215: https://github.com/galaxyproject/galaxy/pull/18215
diff --git a/doc/source/releases/24.2_announce.rst b/doc/source/releases/24.2_announce.rst
new file mode 100644
index 000000000000..112bddcd20d5
--- /dev/null
+++ b/doc/source/releases/24.2_announce.rst
@@ -0,0 +1,12 @@
+
+:orphan:
+
+===========================================================
+October 2024 Galaxy Release (v 24.2)
+===========================================================
+
+
+Schedule
+===========================================================
+ * Planned Freeze Date: 2024-10-07
+ * Planned Release Date: 2024-10-28
diff --git a/doc/source/releases/images/24.1-doi.png b/doc/source/releases/images/24.1-doi.png
new file mode 100644
index 000000000000..9edc010172c4
Binary files /dev/null and b/doc/source/releases/images/24.1-doi.png differ
diff --git a/doc/source/releases/images/24.1-pagination.gif b/doc/source/releases/images/24.1-pagination.gif
new file mode 100644
index 000000000000..c6255a0464a3
Binary files /dev/null and b/doc/source/releases/images/24.1-pagination.gif differ
diff --git a/doc/source/releases/images/24.1-wf_graph.png b/doc/source/releases/images/24.1-wf_graph.png
new file mode 100644
index 000000000000..c49ee58cc336
Binary files /dev/null and b/doc/source/releases/images/24.1-wf_graph.png differ
diff --git a/doc/source/releases/images/24.1-wf_selection.png b/doc/source/releases/images/24.1-wf_selection.png
new file mode 100644
index 000000000000..0100ec935457
Binary files /dev/null and b/doc/source/releases/images/24.1-wf_selection.png differ
diff --git a/doc/source/releases/images/24.1-zenodo.png b/doc/source/releases/images/24.1-zenodo.png
new file mode 100644
index 000000000000..d89b2f38e7b3
Binary files /dev/null and b/doc/source/releases/images/24.1-zenodo.png differ
diff --git a/doc/source/releases/index.rst b/doc/source/releases/index.rst
index a4cc7a9ebf3e..5e9d65038a4f 100644
--- a/doc/source/releases/index.rst
+++ b/doc/source/releases/index.rst
@@ -4,6 +4,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   24.1_announce_user
    24.0_announce_user
    23.2_announce_user
    23.1_announce_user
diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample
index f0f96237e80b..315525bc6183 100644
--- a/lib/galaxy/config/sample/datatypes_conf.xml.sample
+++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample
@@ -361,6 +361,7 @@
     <datatype extension="fast5.tar.gz" type="galaxy.datatypes.binary:Fast5ArchiveGz" display_in_upload="true"/>
     <datatype extension="fast5.tar.bz2" type="galaxy.datatypes.binary:Fast5ArchiveBz2" display_in_upload="true"/>
     <datatype extension="fast5.tar.xz" type="galaxy.datatypes.binary:Fast5ArchiveXz" display_in_upload="true"/>
+    <datatype extension="pod5" type="galaxy.datatypes.binary:Pod5" display_in_upload="true"/>
     <datatype extension="peptideshaker_archive" type="galaxy.datatypes.binary:CompressedArchive" subclass="true" display_in_upload="true"/>
     <datatype extension="percin" type="galaxy.datatypes.tabular:Tabular" subclass="true"/>
     <datatype extension="percout" type="galaxy.datatypes.xml:GenericXml" subclass="true"/>
@@ -1079,6 +1080,7 @@
     <sniffer type="galaxy.datatypes.binary:Fast5ArchiveXz"/>
     <sniffer type="galaxy.datatypes.binary:Fast5ArchiveBz2"/>
     <sniffer type="galaxy.datatypes.binary:Fast5Archive"/>
+    <sniffer type="galaxy.datatypes.binary:Pod5"/>
     <sniffer type="galaxy.datatypes.binary:Meryldb" />
     <sniffer type="galaxy.datatypes.binary:Bref3" />
     <sniffer type="galaxy.datatypes.binary:PostgresqlArchive"/>
diff --git a/lib/galaxy/config/sample/job_conf.sample.yml b/lib/galaxy/config/sample/job_conf.sample.yml
index 27f8522ecfef..849aabba1eec 100644
--- a/lib/galaxy/config/sample/job_conf.sample.yml
+++ b/lib/galaxy/config/sample/job_conf.sample.yml
@@ -513,13 +513,13 @@ execution:
       # trust tool's specified container - a destination wide override
       # can be set. This will cause all jobs on this destination to use
       # that docker image.
-      #docker_container_id_override: busybox:ubuntu-14.04
+      #docker_container_id_override: busybox:1.36.1-glibc
 
       # Likewise, if deployer wants to use docker for isolation and
       # does trust tool's specified container - but also wants tool's not
       # configured to run in a container the following option can provide
       # a fallback. -->
-      #docker_default_container_id: busybox:ubuntu-14.04
+      #docker_default_container_id: busybox:1.36.1-glibc
 
       # If the destination should be secured to only allow containerized jobs
       # the following parameter may be set for the job destination. Some tools
@@ -633,7 +633,7 @@ execution:
         - type: docker
           shell: '/bin/sh'
           resolve_dependencies: false
-          identifier: 'busybox:ubuntu-14.04'
+          identifier: 'busybox:1.36.1-glibc'
         - type: singularity
           shell: '/bin/sh'
           resolve_dependencies: false
@@ -642,7 +642,7 @@ execution:
         - type: docker
           shell: '/bin/sh'
           resolve_dependencies: false
-          identifier: 'busybox:ubuntu-14.04'
+          identifier: 'busybox:1.36.1-glibc'
         - type: singularity
           shell: '/bin/sh'
           resolve_dependencies: false
diff --git a/lib/galaxy/config/sample/job_conf.xml.sample_advanced b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
index bf6b739175d5..dc67a4763d74 100644
--- a/lib/galaxy/config/sample/job_conf.xml.sample_advanced
+++ b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
@@ -588,13 +588,13 @@
                trust tool's specified container - a destination wide override
                can be set. This will cause all jobs on this destination to use
                that docker image. -->
-          <!-- <param id="docker_container_id_override">busybox:ubuntu-14.04</param> -->
+          <!-- <param id="docker_container_id_override">busybox:1.36.1-glibc</param> -->
 
           <!-- Likewise, if deployer wants to use docker for isolation and
                does trust tool's specified container - but also wants tool's not
                configured to run in a container the following option can provide
                a fallback. -->
-          <!-- <param id="docker_default_container_id">busybox:ubuntu-14.04</param> -->
+          <!-- <param id="docker_default_container_id">busybox:1.36.1-glibc</param> -->
 
           <!-- If the destination should be secured to only allow containerized jobs
                the following parameter may be set for the job destination. Some tools do
@@ -674,11 +674,11 @@
                the enabled container types for this destination will be used.
           -->
           <param id="container_override">
-              <container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:ubuntu-14.04</container>
+              <container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:1.36.1-glibc</container>
               <container type="singularity" shell="/bin/sh" resolve_dependencies="false">/path/to/default/container</container>
           </param>
           <param id="container">
-              <container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:ubuntu-14.04</container>
+              <container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:1.36.1-glibc</container>
               <container type="singularity" shell="/bin/sh" resolve_dependencies="false">/path/to/default/container</container>
           </param>
         </destination>
@@ -966,7 +966,7 @@
             container ID will be passed along to condor as
             the docker_image submission parameter.
             -->
-            <!-- <param id="docker_default_container_id">busybox:ubuntu-14.04</param> -->
+            <!-- <param id="docker_default_container_id">busybox:1.36.1-glibc</param> -->
         </destination>
 
         <!-- Jobs can be re-submitted for various reasons (to the same destination or others,
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index b27179d8bb5c..a43e592e4b10 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -2905,6 +2905,7 @@ mapping:
         type: str
         default: default
         required: false
+        per_host: true
         desc: |
           Default tool panel view for the current Galaxy configuration. This should refer to an id of
           a panel view defined using the panel_views or panel_views_dir configuration options or an
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
index 853a6e402977..4bcb3f8488a5 100644
--- a/lib/galaxy/datatypes/binary.py
+++ b/lib/galaxy/datatypes/binary.py
@@ -3759,6 +3759,31 @@ def sniff(self, filename: str) -> bool:
         return Fast5Archive.sniff(self, filename)
 
 
+class Pod5(Binary):
+    """
+    Class describing a POD5 file. The POD5 Format Specification is at
+    https://pod5-file-format.readthedocs.io/en/latest/SPECIFICATION.html
+
+    >>> from galaxy.datatypes.sniff import get_test_fname
+    >>> fname = get_test_fname('test.pod5')
+    >>> Pod5().sniff(fname)
+    True
+    >>> fname = get_test_fname('test.fast5.tar')
+    >>> Pod5().sniff(fname)
+    False
+    """
+
+    file_ext = "pod5"
+
+    def sniff(self, filename: str) -> bool:
+        expected_signature = bytes([0x8B, 0x50, 0x4F, 0x44, 0x0D, 0x0A, 0x1A, 0x0A])
+        with open(filename, "rb") as f:
+            first_8_bytes = f.read(8)
+            f.seek(-8, 2)
+            last_8_bytes = f.read(8)
+            return first_8_bytes == expected_signature and last_8_bytes == expected_signature
+
+
 class SearchGuiArchive(CompressedArchive):
     """Class describing a SearchGUI archive"""
 
diff --git a/lib/galaxy/datatypes/genetics.py b/lib/galaxy/datatypes/genetics.py
index 83136fcb7b9e..a17ee92c9b08 100644
--- a/lib/galaxy/datatypes/genetics.py
+++ b/lib/galaxy/datatypes/genetics.py
@@ -334,7 +334,6 @@ def regenerate_primary_file(self, dataset: DatasetProtocol) -> None:
         ]
         for fname in flist:
             sfname = os.path.split(fname)[-1]
-            f, e = os.path.splitext(fname)
             rval.append(f'<li><a href="{sfname}">{sfname}</a></li>')
         rval.append("</ul></body></html>")
         with open(dataset.get_file_name(), "w") as f:
diff --git a/lib/galaxy/datatypes/spaln.py b/lib/galaxy/datatypes/spaln.py
index c3728ef6b4ea..8e27fde546bf 100644
--- a/lib/galaxy/datatypes/spaln.py
+++ b/lib/galaxy/datatypes/spaln.py
@@ -91,7 +91,6 @@ def regenerate_primary_file(self, dataset: DatasetProtocol) -> None:
         ]
         for fname in flist:
             sfname = os.path.split(fname)[-1]
-            f, e = os.path.splitext(fname)
             rval.append(f'<li><a href="{sfname}">{sfname}</a></li>')
         rval.append("</ul></body></html>")
         with open(dataset.get_file_name(), "w") as f:
diff --git a/lib/galaxy/datatypes/test/test.pod5 b/lib/galaxy/datatypes/test/test.pod5
new file mode 100644
index 000000000000..0e62d3624220
Binary files /dev/null and b/lib/galaxy/datatypes/test/test.pod5 differ
diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index 37cfc753bfd8..1b1fcdde3007 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/lib/galaxy/dependencies/dev-requirements.txt
@@ -1,3 +1,5 @@
+--extra-index-url https://wheels.galaxyproject.org/simple
+
 aiohttp==3.9.5 ; python_version >= "3.8" and python_version < "3.13"
 aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.13"
 alabaster==0.7.13 ; python_version >= "3.8" and python_version < "3.13"
@@ -10,8 +12,8 @@ babel==2.15.0 ; python_version >= "3.8" and python_version < "3.13"
 backports-tarfile==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
 backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9"
 black==24.4.2 ; python_version >= "3.8" and python_version < "3.13"
-boto3==1.34.106 ; python_version >= "3.8" and python_version < "3.13"
-botocore==1.34.106 ; python_version >= "3.8" and python_version < "3.13"
+boto3==1.34.131 ; python_version >= "3.8" and python_version < "3.13"
+botocore==1.34.131 ; python_version >= "3.8" and python_version < "3.13"
 build==1.2.1 ; python_version >= "3.8" and python_version < "3.13"
 cachecontrol[filecache]==0.14.0 ; python_version >= "3.8" and python_version < "3.13"
 certifi==2024.6.2 ; python_version >= "3.8" and python_version < "3.13"
@@ -20,8 +22,9 @@ charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.13"
 click==8.1.7 ; python_version >= "3.8" and python_version < "3.13"
 codespell==2.3.0 ; python_version >= "3.8" and python_version < "3.13"
 colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.13" and (sys_platform == "win32" or platform_system == "Windows" or os_name == "nt")
-contourpy==1.1.1 ; python_version >= "3.8" and python_version < "3.13"
-coverage[toml]==7.5.3 ; python_version >= "3.8" and python_version < "3.13"
+contourpy==1.1.1 ; python_version >= "3.8" and python_version < "3.9"
+contourpy==1.2.1 ; python_version >= "3.9" and python_version < "3.13"
+coverage[toml]==7.5.4 ; python_version >= "3.8" and python_version < "3.13"
 cryptography==42.0.8 ; python_version >= "3.8" and python_version < "3.13"
 cwltest==2.5.20240425111257 ; python_version >= "3.8" and python_version < "3.13"
 cycler==0.12.1 ; python_version >= "3.8" and python_version < "3.13"
@@ -33,7 +36,7 @@ deprecated==1.2.14 ; python_version >= "3.8" and python_version < "3.13"
 docutils==0.20.1 ; python_version >= "3.8" and python_version < "3.13"
 dogpile-cache==1.2.2 ; python_version >= "3.9" and python_version < "3.13"
 exceptiongroup==1.2.1 ; python_version >= "3.8" and python_version < "3.11"
-filelock==3.14.0 ; python_version >= "3.8" and python_version < "3.13"
+filelock==3.15.4 ; python_version >= "3.8" and python_version < "3.13"
 fluent-logger==0.11.1 ; python_version >= "3.8" and python_version < "3.13"
 fonttools==4.53.0 ; python_version >= "3.8" and python_version < "3.13"
 frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.13"
@@ -45,7 +48,7 @@ httpcore==1.0.5 ; python_version >= "3.8" and python_version < "3.13"
 httpx==0.27.0 ; python_version >= "3.8" and python_version < "3.13"
 idna==3.7 ; python_version >= "3.8" and python_version < "3.13"
 imagesize==1.4.1 ; python_version >= "3.8" and python_version < "3.13"
-importlib-metadata==7.1.0 ; python_version >= "3.8" and python_version < "3.13"
+importlib-metadata==8.0.0 ; python_version >= "3.8" and python_version < "3.13"
 importlib-resources==6.4.0 ; python_version >= "3.8" and python_version < "3.10"
 iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "3.13"
 isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.13"
@@ -61,7 +64,7 @@ jsonschema==4.20.0 ; python_version >= "3.9" and python_version < "3.13"
 junit-xml==1.9 ; python_version >= "3.8" and python_version < "3.13"
 keyring==25.2.1 ; python_version >= "3.8" and python_version < "3.13"
 kiwisolver==1.4.5 ; python_version >= "3.8" and python_version < "3.13"
-lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.13"
+lxml==5.2.2 ; python_version >= "3.8" and python_version < "3.13"
 markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.13"
 markdown-it-reporter==0.0.2 ; python_version >= "3.8" and python_version < "3.13"
 markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "3.13"
@@ -71,29 +74,29 @@ mdit-py-plugins==0.4.1 ; python_version >= "3.8" and python_version < "3.13"
 mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.13"
 mirakuru==2.5.2 ; python_version >= "3.8" and python_version < "3.13"
 mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.13"
-more-itertools==10.2.0 ; python_version >= "3.8" and python_version < "3.13"
+more-itertools==10.3.0 ; python_version >= "3.8" and python_version < "3.13"
 msgpack==1.0.8 ; python_version >= "3.8" and python_version < "3.13"
 multidict==6.0.5 ; python_version >= "3.8" and python_version < "3.13"
 mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13"
 myst-parser==3.0.1 ; python_version >= "3.8" and python_version < "3.13"
 nh3==0.2.17 ; python_version >= "3.8" and python_version < "3.13"
 numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9"
-numpy==1.26.4 ; python_version >= "3.9" and python_version < "3.13"
+numpy==2.0.0 ; python_version >= "3.9" and python_version < "3.13"
 onedatafilerestclient==21.2.5.1 ; python_version >= "3.8" and python_version < "3.13"
 outcome==1.3.0.post0 ; python_version >= "3.8" and python_version < "3.13"
-packaging==24.0 ; python_version >= "3.8" and python_version < "3.13"
+packaging==24.1 ; python_version >= "3.8" and python_version < "3.13"
 pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.13"
 pbr==6.0.0 ; python_version >= "3.9" and python_version < "3.13"
-pillow==10.3.0 ; python_version >= "3.8" and python_version < "3.13"
+pillow==10.4.0 ; python_version >= "3.8" and python_version < "3.13"
 pkce==1.0.3 ; python_version >= "3.8" and python_version < "3.13"
-pkginfo==1.11.1 ; python_version >= "3.8" and python_version < "3.13"
+pkginfo==1.10.0 ; python_version >= "3.8" and python_version < "3.13"
 platformdirs==4.2.2 ; python_version >= "3.8" and python_version < "3.13"
-playwright==1.44.0 ; python_version >= "3.8" and python_version < "3.13"
+playwright==1.45.0 ; python_version >= "3.8" and python_version < "3.13"
 pluggy==1.5.0 ; python_version >= "3.8" and python_version < "3.13"
 port-for==0.7.2 ; python_version >= "3.8" and python_version < "3.13"
 prettytable==3.10.0 ; python_version >= "3.8" and python_version < "3.13"
-psutil==5.9.8 ; python_version >= "3.8" and python_version < "3.13" and sys_platform != "cygwin"
-psycopg==3.1.19 ; python_version >= "3.8" and python_version < "3.13"
+psutil==6.0.0 ; python_version >= "3.8" and python_version < "3.13" and sys_platform != "cygwin"
+psycopg==3.2.1 ; python_version >= "3.8" and python_version < "3.13"
 pycparser==2.22 ; python_version >= "3.8" and python_version < "3.13"
 pyee==11.1.0 ; python_version >= "3.8" and python_version < "3.13"
 pygithub==2.3.0 ; python_version >= "3.8" and python_version < "3.13"
@@ -111,7 +114,7 @@ pytest-httpserver==1.0.10 ; python_version >= "3.8" and python_version < "3.13"
 pytest-json-report==1.5.0 ; python_version >= "3.8" and python_version < "3.13"
 pytest-metadata==3.1.1 ; python_version >= "3.8" and python_version < "3.13"
 pytest-mock==3.14.0 ; python_version >= "3.8" and python_version < "3.13"
-pytest-playwright==0.5.0 ; python_version >= "3.8" and python_version < "3.13"
+pytest-playwright==0.5.1 ; python_version >= "3.8" and python_version < "3.13"
 pytest-postgresql==6.0.0 ; python_version >= "3.8" and python_version < "3.13"
 pytest-shard==0.1.2 ; python_version >= "3.8" and python_version < "3.13"
 pytest==7.4.4 ; python_version >= "3.8" and python_version < "3.13"
@@ -126,21 +129,22 @@ readme-renderer==43.0 ; python_version >= "3.8" and python_version < "3.13"
 referencing==0.35.1 ; python_version >= "3.9" and python_version < "3.13"
 requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "3.13"
 requests==2.32.3 ; python_version >= "3.8" and python_version < "3.13"
-responses==0.25.2 ; python_version >= "3.8" and python_version < "3.13"
+responses==0.25.3 ; python_version >= "3.8" and python_version < "3.13"
 rfc3986==2.0.0 ; python_version >= "3.8" and python_version < "3.13"
 rich==13.7.1 ; python_version >= "3.8" and python_version < "3.13"
 rpds-py==0.18.1 ; python_version >= "3.9" and python_version < "3.13"
 ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.8"
 ruamel-yaml==0.18.6 ; python_version >= "3.8" and python_version < "3.13"
-rucio-clients==34.4.2 ; python_version >= "3.9" and python_version < "3.13"
-s3transfer==0.10.1 ; python_version >= "3.8" and python_version < "3.13"
+rucio-clients==34.5.0 ; python_version >= "3.9" and python_version < "3.13"
+s3transfer==0.10.2 ; python_version >= "3.8" and python_version < "3.13"
 schema-salad==8.5.20240503091721 ; python_version >= "3.8" and python_version < "3.13"
 scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.9"
-scipy==1.13.1 ; python_version >= "3.9" and python_version < "3.13"
+scipy==1.13.1 ; python_version >= "3.9" and python_version < "3.10"
+scipy==1.14.0 ; python_version >= "3.10" and python_version < "3.13"
 secretstorage==3.3.3 ; python_version >= "3.8" and python_version < "3.13" and sys_platform == "linux"
-selenium==4.21.0 ; python_version >= "3.8" and python_version < "3.13"
+selenium==4.22.0 ; python_version >= "3.8" and python_version < "3.13"
 seletools==1.5.0 ; python_version >= "3.8" and python_version < "3.13"
-setuptools==70.0.0 ; python_version >= "3.8" and python_version < "3.13"
+setuptools==70.2.0 ; python_version >= "3.8" and python_version < "3.13"
 six==1.16.0 ; python_version >= "3.8" and python_version < "3.13"
 sniffio==1.3.1 ; python_version >= "3.8" and python_version < "3.13"
 snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "3.13"
@@ -165,14 +169,15 @@ tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6"
 trio-websocket==0.11.1 ; python_version >= "3.8" and python_version < "3.13"
 trio==0.25.1 ; python_version >= "3.8" and python_version < "3.13"
 tuspy==1.0.3 ; python_version >= "3.8" and python_version < "3.13"
-twill==3.2.4 ; python_version >= "3.8" and python_version < "3.13"
-twine==5.1.0 ; python_version >= "3.8" and python_version < "3.13"
+twill==3.2.5 ; python_version >= "3.8" and python_version < "3.13"
+twine==5.1.1 ; python_version >= "3.8" and python_version < "3.13"
 typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "3.13"
 tzdata==2024.1 ; python_version >= "3.8" and python_version < "3.13" and sys_platform == "win32"
-urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.13"
-urllib3[socks]==1.26.18 ; python_version >= "3.8" and python_version < "3.13"
+urllib3==1.26.19 ; python_version >= "3.8" and python_version < "3.13"
+urllib3[socks]==1.26.19 ; python_version >= "3.8" and python_version < "3.13"
 watchdog==4.0.1 ; python_version >= "3.8" and python_version < "3.13"
 wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.13"
+websocket-client==1.8.0 ; python_version >= "3.8" and python_version < "3.13"
 werkzeug==3.0.3 ; python_version >= "3.8" and python_version < "3.13"
 wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.13"
 wsproto==1.2.0 ; python_version >= "3.8" and python_version < "3.13"
diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt
index 9cd22f68931b..3df072eefc30 100644
--- a/lib/galaxy/dependencies/pinned-lint-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt
@@ -1,7 +1,7 @@
 attrs==23.2.0
-flake8==7.0.0
+flake8==7.1.0
 flake8-bugbear==24.4.26
 mccabe==0.7.0
-pycodestyle==2.11.1
+pycodestyle==2.12.0
 pyflakes==3.2.0
-ruff==0.4.8
+ruff==0.5.0
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index 7a0e084d61a0..a0b6b7e68228 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -1,14 +1,14 @@
 --extra-index-url https://wheels.galaxyproject.org/simple
 
-a2wsgi==1.10.4 ; python_version >= "3.8" and python_version < "3.13"
+a2wsgi==1.10.6 ; python_version >= "3.8" and python_version < "3.13"
 adal==1.2.7 ; python_version >= "3.8" and python_version < "3.13"
-aiobotocore==2.13.0 ; python_version >= "3.8" and python_version < "3.13"
+aiobotocore==2.13.1 ; python_version >= "3.8" and python_version < "3.13"
 aiodataloader==0.4.0 ; python_version >= "3.8" and python_version < "3.13"
-aiofiles==23.2.1 ; python_version >= "3.8" and python_version < "3.13"
+aiofiles==24.1.0 ; python_version >= "3.8" and python_version < "3.13"
 aiohttp==3.9.5 ; python_version >= "3.8" and python_version < "3.13"
 aioitertools==0.11.0 ; python_version >= "3.8" and python_version < "3.13"
 aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.13"
-alembic==1.13.1 ; python_version >= "3.8" and python_version < "3.13"
+alembic==1.13.2 ; python_version >= "3.8" and python_version < "3.13"
 amqp==5.2.0 ; python_version >= "3.8" and python_version < "3.13"
 aniso8601==9.0.1 ; python_version >= "3.8" and python_version < "3.13"
 annotated-types==0.7.0 ; python_version >= "3.8" and python_version < "3.13"
@@ -16,7 +16,7 @@ anyio==4.4.0 ; python_version >= "3.8" and python_version < "3.13"
 apispec==6.6.1 ; python_version >= "3.8" and python_version < "3.13"
 appdirs==1.4.4 ; python_version >= "3.8" and python_version < "3.13"
 arcp==0.2.1 ; python_version >= "3.8" and python_version < "3.13"
-argcomplete==3.3.0 ; python_version >= "3.8" and python_version < "3.13"
+argcomplete==3.4.0 ; python_version >= "3.8" and python_version < "3.13"
 async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.11"
 attmap==0.13.2 ; python_version >= "3.8" and python_version < "3.13"
 attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.13"
@@ -33,8 +33,8 @@ bioblend==1.3.0 ; python_version >= "3.8" and python_version < "3.13"
 bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.13"
 boltons==24.0.0 ; python_version >= "3.8" and python_version < "3.13"
 boto==2.49.0 ; python_version >= "3.8" and python_version < "3.13"
-botocore==1.34.106 ; python_version >= "3.8" and python_version < "3.13"
-bx-python==0.11.0 ; python_version >= "3.8" and python_version < "3.13"
+botocore==1.34.131 ; python_version >= "3.8" and python_version < "3.13"
+bx-python==0.12.0 ; python_version >= "3.8" and python_version < "3.13"
 cachecontrol[filecache]==0.14.0 ; python_version >= "3.8" and python_version < "3.13"
 celery==5.4.0 ; python_version >= "3.8" and python_version < "3.13"
 certifi==2024.6.2 ; python_version >= "3.8" and python_version < "3.13"
@@ -55,7 +55,6 @@ cryptography==42.0.8 ; python_version >= "3.8" and python_version < "3.13"
 cwl-upgrader==1.2.11 ; python_version >= "3.8" and python_version < "3.13"
 cwl-utils==0.33 ; python_version >= "3.8" and python_version < "3.13"
 cwltool==3.1.20240508115724 ; python_version >= "3.8" and python_version < "3.13"
-decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.13"
 defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.13"
 deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.13"
 dictobj==0.4 ; python_version >= "3.8" and python_version < "3.13"
@@ -64,13 +63,13 @@ docopt==0.6.2 ; python_version >= "3.8" and python_version < "3.13"
 docutils==0.20.1 ; python_version >= "3.8" and python_version < "3.13"
 dparse==0.6.3 ; python_version >= "3.8" and python_version < "3.13"
 edam-ontology==1.25.2 ; python_version >= "3.8" and python_version < "3.13"
-email-validator==2.1.1 ; python_version >= "3.8" and python_version < "3.13"
+email-validator==2.2.0 ; python_version >= "3.8" and python_version < "3.13"
 exceptiongroup==1.2.1 ; python_version >= "3.8" and python_version < "3.11"
 fastapi-slim==0.111.0 ; python_version >= "3.8" and python_version < "3.13"
-filelock==3.14.0 ; python_version >= "3.8" and python_version < "3.13"
+filelock==3.15.4 ; python_version >= "3.8" and python_version < "3.13"
 frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.13"
 fs==2.4.16 ; python_version >= "3.8" and python_version < "3.13"
-fsspec==2024.6.0 ; python_version >= "3.8" and python_version < "3.13"
+fsspec==2024.6.1 ; python_version >= "3.8" and python_version < "3.13"
 future==1.0.0 ; python_version >= "3.8" and python_version < "3.13"
 galaxy-sequence-utils==1.1.5 ; python_version >= "3.8" and python_version < "3.13"
 galaxy2cwl==0.1.4 ; python_version >= "3.8" and python_version < "3.13"
@@ -79,7 +78,7 @@ graphene==3.3 ; python_version >= "3.8" and python_version < "3.13"
 graphql-core==3.2.3 ; python_version >= "3.8" and python_version < "3.13"
 graphql-relay==3.2.0 ; python_version >= "3.8" and python_version < "3.13"
 gravity==1.0.6 ; python_version >= "3.8" and python_version < "3.13"
-greenlet==3.0.3 ; python_version >= "3.8" and python_version < "3.13" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32")
+greenlet==3.0.3 ; python_version < "3.13" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version >= "3.8"
 gunicorn==22.0.0 ; python_version >= "3.8" and python_version < "3.13"
 gxformat2==0.18.0 ; python_version >= "3.8" and python_version < "3.13"
 h11==0.14.0 ; python_version >= "3.8" and python_version < "3.13"
@@ -87,9 +86,9 @@ h5grove==2.2.0 ; python_version >= "3.8" and python_version < "3.13"
 h5py==3.11.0 ; python_version >= "3.8" and python_version < "3.13"
 humanfriendly==10.0 ; python_version >= "3.8" and python_version < "3.13"
 idna==3.7 ; python_version >= "3.8" and python_version < "3.13"
-importlib-metadata==7.1.0 ; python_version >= "3.8" and python_version < "3.13"
+importlib-metadata==8.0.0 ; python_version >= "3.8" and python_version < "3.13"
 importlib-resources==6.4.0 ; python_version >= "3.8" and python_version < "3.9"
-isa-rwval==0.10.10 ; python_version >= "3.8" and python_version < "3.13"
+isa-rwval @ git+https://github.com/nsoranzo/isa-rwval.git@3d989181058d2765a93cb0e7ca85d6955e0eb6ef ; python_version >= "3.8" and python_version < "3.13"
 isal==1.6.1 ; python_version >= "3.8" and python_version < "3.13"
 isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.13"
 jinja2==3.1.4 ; python_version >= "3.8" and python_version < "3.13"
@@ -99,44 +98,44 @@ jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_versio
 jsonschema==4.20.0 ; python_version >= "3.8" and python_version < "3.13"
 kombu==5.3.7 ; python_version >= "3.8" and python_version < "3.13"
 lagom==2.6.0 ; python_version >= "3.8" and python_version < "3.13"
-lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.13"
+lxml==5.2.2 ; python_version >= "3.8" and python_version < "3.13"
 mako==1.3.5 ; python_version >= "3.8" and python_version < "3.13"
 markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.13"
 markdown==3.6 ; python_version >= "3.8" and python_version < "3.13"
 markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "3.13"
 mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.13"
-mercurial==6.7.3 ; python_version >= "3.8" and python_version < "3.13"
+mercurial==6.7.4 ; python_version >= "3.8" and python_version < "3.13"
 mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.13"
 mrcfile==1.5.0 ; python_version >= "3.8" and python_version < "3.13"
-msal==1.28.0 ; python_version >= "3.8" and python_version < "3.13"
+msal==1.29.0 ; python_version >= "3.8" and python_version < "3.13"
 msgpack==1.0.8 ; python_version >= "3.8" and python_version < "3.13"
 multidict==6.0.5 ; python_version >= "3.8" and python_version < "3.13"
 mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13"
-networkx==2.5 ; python_version >= "3.8" and python_version < "3.13"
+networkx==3.1 ; python_version >= "3.8" and python_version < "3.13"
 nodeenv==1.9.1 ; python_version >= "3.8" and python_version < "3.13"
 numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9"
-numpy==1.26.4 ; python_version >= "3.9" and python_version < "3.13"
+numpy==2.0.0 ; python_version >= "3.9" and python_version < "3.13"
 oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "3.13"
-orjson==3.10.3 ; python_version >= "3.8" and python_version < "3.13"
+orjson==3.10.6 ; python_version >= "3.8" and python_version < "3.13"
 oyaml==1.0 ; python_version >= "3.8" and python_version < "3.13"
-packaging==24.0 ; python_version >= "3.8" and python_version < "3.13"
+packaging==24.1 ; python_version >= "3.8" and python_version < "3.13"
 paramiko==3.4.0 ; python_version >= "3.8" and python_version < "3.13"
 parsley==1.3 ; python_version >= "3.8" and python_version < "3.13"
 paste==3.10.1 ; python_version >= "3.8" and python_version < "3.13"
 pastedeploy==3.1.0 ; python_version >= "3.8" and python_version < "3.13"
 pebble==5.0.7 ; python_version >= "3.8" and python_version < "3.13"
-pillow==10.3.0 ; python_version >= "3.8" and python_version < "3.13"
+pillow==10.4.0 ; python_version >= "3.8" and python_version < "3.13"
 promise==2.3 ; python_version >= "3.8" and python_version < "3.13"
-prompt-toolkit==3.0.46 ; python_version >= "3.8" and python_version < "3.13"
+prompt-toolkit==3.0.47 ; python_version >= "3.8" and python_version < "3.13"
 prov==1.5.1 ; python_version >= "3.8" and python_version < "3.13"
-psutil==5.9.8 ; python_version >= "3.8" and python_version < "3.13"
+psutil==6.0.0 ; python_version >= "3.8" and python_version < "3.13"
 pulsar-galaxy-lib==0.15.6 ; python_version >= "3.8" and python_version < "3.13"
 pycparser==2.22 ; python_version >= "3.8" and python_version < "3.13"
 pycryptodome==3.20.0 ; python_version >= "3.8" and python_version < "3.13"
-pydantic-core==2.18.4 ; python_version >= "3.8" and python_version < "3.13"
+pydantic-core==2.20.0 ; python_version >= "3.8" and python_version < "3.13"
 pydantic-tes==0.1.5 ; python_version >= "3.8" and python_version < "3.13"
-pydantic==2.7.3 ; python_version >= "3.8" and python_version < "3.13"
-pydantic[email]==2.7.3 ; python_version >= "3.8" and python_version < "3.13"
+pydantic==2.8.0 ; python_version >= "3.8" and python_version < "3.13"
+pydantic[email]==2.8.0 ; python_version >= "3.8" and python_version < "3.13"
 pydot==2.0.0 ; python_version >= "3.8" and python_version < "3.13"
 pyeventsystem==0.1.0 ; python_version >= "3.8" and python_version < "3.13"
 pyfaidx==0.8.1.1 ; python_version >= "3.8" and python_version < "3.13"
@@ -171,17 +170,17 @@ routes==2.5.1 ; python_version >= "3.8" and python_version < "3.13"
 rpds-py==0.18.1 ; python_version >= "3.8" and python_version < "3.13"
 ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.8"
 ruamel-yaml==0.18.6 ; python_version >= "3.8" and python_version < "3.13"
-s3fs==2024.6.0 ; python_version >= "3.8" and python_version < "3.13"
+s3fs==2024.6.1 ; python_version >= "3.8" and python_version < "3.13"
 schema-salad==8.5.20240503091721 ; python_version >= "3.8" and python_version < "3.13"
 setuptools-scm==5.0.2 ; python_version >= "3.8" and python_version < "3.13"
-setuptools==70.0.0 ; python_version >= "3.8" and python_version < "3.13"
+setuptools==70.2.0 ; python_version >= "3.8" and python_version < "3.13"
 shellescape==3.8.1 ; python_version >= "3.8" and python_version < "3.13"
 six==1.16.0 ; python_version >= "3.8" and python_version < "3.13"
 sniffio==1.3.1 ; python_version >= "3.8" and python_version < "3.13"
 social-auth-core==4.5.4 ; python_version >= "3.8" and python_version < "3.13"
 sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.13"
 spython==0.3.13 ; python_version >= "3.8" and python_version < "3.13"
-sqlalchemy==2.0.30 ; python_version >= "3.8" and python_version < "3.13"
+sqlalchemy==2.0.31 ; python_version >= "3.8" and python_version < "3.13"
 sqlitedict==2.1.0 ; python_version >= "3.8" and python_version < "3.13"
 sqlparse==0.5.0 ; python_version >= "3.8" and python_version < "3.13"
 starlette-context==0.3.6 ; python_version >= "3.8" and python_version < "3.13"
@@ -189,7 +188,7 @@ starlette-graphene3==0.6.0 ; python_version >= "3.8" and python_version < "3.13"
 starlette==0.37.2 ; python_version >= "3.8" and python_version < "3.13"
 supervisor==4.2.5 ; python_version >= "3.8" and python_version < "3.13"
 svgwrite==1.4.3 ; python_version >= "3.8" and python_version < "3.13"
-tenacity==8.3.0 ; python_version >= "3.8" and python_version < "3.13"
+tenacity==8.4.2 ; python_version >= "3.8" and python_version < "3.13"
 tifffile==2023.7.10 ; python_version >= "3.8" and python_version < "3.13"
 tinydb==4.8.0 ; python_version >= "3.8" and python_version < "3.13"
 tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11"
@@ -201,7 +200,7 @@ typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "3.13"
 tzdata==2024.1 ; python_version >= "3.8" and python_version < "3.13"
 tzlocal==5.2 ; python_version >= "3.8" and python_version < "3.13"
 ubiquerg==0.8.0 ; python_version >= "3.8" and python_version < "3.13"
-urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.13"
+urllib3==1.26.19 ; python_version >= "3.8" and python_version < "3.13"
 uvicorn==0.30.1 ; python_version >= "3.8" and python_version < "3.13"
 uvloop==0.19.0 ; python_version >= "3.8" and python_version < "3.13"
 vine==5.1.0 ; python_version >= "3.8" and python_version < "3.13"
diff --git a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
index 7f5ddd202f6e..f37b1b56f55d 100644
--- a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
@@ -1,17 +1,19 @@
+--extra-index-url https://wheels.galaxyproject.org/simple
+
 annotated-types==0.7.0 ; python_version >= "3.8" and python_version < "3.13"
-boto3-stubs[s3]==1.34.122 ; python_version >= "3.8" and python_version < "3.13"
-botocore-stubs==1.34.122 ; python_version >= "3.8" and python_version < "3.13"
+boto3-stubs[s3]==1.34.138 ; python_version >= "3.8" and python_version < "3.13"
+botocore-stubs==1.34.138 ; python_version >= "3.8" and python_version < "3.13"
 cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.13" and platform_python_implementation != "PyPy"
 cryptography==42.0.8 ; python_version >= "3.8" and python_version < "3.13"
 lxml-stubs==0.5.1 ; python_version >= "3.8" and python_version < "3.13"
-mypy-boto3-s3==1.34.120 ; python_version >= "3.8" and python_version < "3.13"
+mypy-boto3-s3==1.34.138 ; python_version >= "3.8" and python_version < "3.13"
 mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13"
-mypy==1.10.0 ; python_version >= "3.8" and python_version < "3.13"
+mypy==1.10.1 ; python_version >= "3.8" and python_version < "3.13"
 pycparser==2.22 ; python_version >= "3.8" and python_version < "3.13" and platform_python_implementation != "PyPy"
-pydantic-core==2.18.4 ; python_version >= "3.8" and python_version < "3.13"
-pydantic==2.7.3 ; python_version >= "3.8" and python_version < "3.13"
+pydantic-core==2.20.0 ; python_version >= "3.8" and python_version < "3.13"
+pydantic==2.8.0 ; python_version >= "3.8" and python_version < "3.13"
 tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11"
-types-awscrt==0.20.11 ; python_version >= "3.8" and python_version < "3.13"
+types-awscrt==0.20.12 ; python_version >= "3.8" and python_version < "3.13"
 types-bleach==6.1.0.20240331 ; python_version >= "3.8" and python_version < "3.13"
 types-boto==2.49.18.20240205 ; python_version >= "3.8" and python_version < "3.13"
 types-contextvars==2.4.7.3 ; python_version >= "3.8" and python_version < "3.13"
diff --git a/lib/galaxy/dependencies/update.sh b/lib/galaxy/dependencies/update.sh
index 6bb140e8f078..c7eee2328ad7 100755
--- a/lib/galaxy/dependencies/update.sh
+++ b/lib/galaxy/dependencies/update.sh
@@ -89,6 +89,7 @@ split_requirement () {
 # supported by Galaxy, so Poetry resorts to an old version. Here we replace any
 # such requirement with multiple Python-version-specific requirements.
 # Packages which specify a maximum Python version pin:
+split_requirement contourpy
 split_requirement matplotlib
 split_requirement numpy
 split_requirement scipy
diff --git a/lib/galaxy/job_execution/setup.py b/lib/galaxy/job_execution/setup.py
index 4d2f54842c48..99385986993a 100644
--- a/lib/galaxy/job_execution/setup.py
+++ b/lib/galaxy/job_execution/setup.py
@@ -213,22 +213,26 @@ def get_input_dataset_fnames(self, ds: DatasetInstance) -> List[str]:
         for value in ds.metadata.values():
             if isinstance(value, MetadataFile):
                 filenames.append(value.get_file_name())
+        if ds.dataset and ds.dataset.extra_files_path_exists():
+            filenames.append(ds.dataset.extra_files_path)
         return filenames
 
-    def get_input_fnames(self) -> List[str]:
+    def get_input_datasets(self) -> List[DatasetInstance]:
         job = self.job
+        return [
+            da.dataset for da in job.input_datasets + job.input_library_datasets if da.dataset
+        ]  # da is JobToInputDatasetAssociation object
+
+    def get_input_fnames(self) -> List[str]:
         filenames = []
-        for da in job.input_datasets + job.input_library_datasets:  # da is JobToInputDatasetAssociation object
-            if da.dataset:
-                filenames.extend(self.get_input_dataset_fnames(da.dataset))
+        for ds in self.get_input_datasets():
+            filenames.extend(self.get_input_dataset_fnames(ds))
         return filenames
 
     def get_input_paths(self) -> List[DatasetPath]:
-        job = self.job
         paths = []
-        for da in job.input_datasets + job.input_library_datasets:  # da is JobToInputDatasetAssociation object
-            if da.dataset:
-                paths.append(self.get_input_path(da.dataset))
+        for ds in self.get_input_datasets():
+            paths.append(self.get_input_path(ds))
         return paths
 
     def get_input_path(self, dataset: DatasetInstance) -> DatasetPath:
diff --git a/lib/galaxy/jobs/splitters/basic.py b/lib/galaxy/jobs/splitters/basic.py
index f19f0bd81636..f2c804ce8ceb 100644
--- a/lib/galaxy/jobs/splitters/basic.py
+++ b/lib/galaxy/jobs/splitters/basic.py
@@ -13,7 +13,7 @@ def set_basic_defaults(job_wrapper):
 
 
 def do_split(job_wrapper):
-    if len(job_wrapper.job_io.get_input_fnames()) > 1 or len(job_wrapper.job_io.get_output_fnames()) > 1:
+    if len(job_wrapper.job_io.get_input_datasets()) > 1 or len(job_wrapper.job_io.get_output_fnames()) > 1:
         log.error("The basic splitter is not capable of handling jobs with multiple inputs or outputs.")
         raise Exception("Job Splitting Failed, the basic splitter only handles tools with one input and one output")
     # add in the missing information for splitting the one input and merging the one output
diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
index be487b4da675..6629e6911267 100644
--- a/lib/galaxy/managers/base.py
+++ b/lib/galaxy/managers/base.py
@@ -178,7 +178,7 @@ def get_object(trans, id, class_name, check_ownership=False, check_accessible=Fa
         item = trans.sa_session.query(item_class).get(decoded_id)
         assert item is not None
     except Exception:
-        log.exception(f"Invalid {class_name} id ( {id} ) specified.")
+        log.warning(f"Invalid {class_name} id ( {id} ) specified.")
         raise exceptions.MessageException(f"Invalid {class_name} id ( {id} ) specified", type="error")
 
     if check_ownership or check_accessible:
diff --git a/lib/galaxy/managers/collections_util.py b/lib/galaxy/managers/collections_util.py
index 0896c2f82dfc..d0ca89f61626 100644
--- a/lib/galaxy/managers/collections_util.py
+++ b/lib/galaxy/managers/collections_util.py
@@ -186,6 +186,7 @@ def dictify_element_reference(
         else:
             object_details["state"] = element_object.state
             object_details["hda_ldda"] = "hda"
+            object_details["purged"] = element_object.purged
             if isinstance(element_object, model.HistoryDatasetAssociation):
                 object_details["history_id"] = element_object.history_id
                 object_details["tags"] = element_object.make_tag_string_list()
diff --git a/lib/galaxy/managers/context.py b/lib/galaxy/managers/context.py
index 24c29567a80b..f578fe79b8f2 100644
--- a/lib/galaxy/managers/context.py
+++ b/lib/galaxy/managers/context.py
@@ -79,11 +79,13 @@ class ProvidesAppContext:
     Mixed in class must provide `app` property.
     """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def app(self) -> MinimalManagerApp:
         """Provide access to the Galaxy ``app`` object."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def url_builder(self) -> Optional[Callable[..., str]]:
         """
         Provide access to Galaxy URLs (if available).
@@ -217,7 +219,8 @@ def async_request_user(self) -> RequestUser:
             raise AuthenticationRequired("The async task requires user authentication.")
         return RequestUser(user_id=self.user.id)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def user(self):
         """Provide access to the user object."""
 
@@ -290,7 +293,8 @@ class ProvidesHistoryContext(ProvidesUserContext):
     properties.
     """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def history(self) -> Optional[History]:
         """Provide access to the user's current history model object.
 
diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
index dd877c582592..546085b26a2e 100644
--- a/lib/galaxy/managers/jobs.py
+++ b/lib/galaxy/managers/jobs.py
@@ -8,6 +8,7 @@
     cast,
     Dict,
     List,
+    Optional,
 )
 
 import sqlalchemy
@@ -26,6 +27,7 @@
 )
 from sqlalchemy.orm import aliased
 from sqlalchemy.sql import select
+from typing_extensions import TypedDict
 
 from galaxy import model
 from galaxy.exceptions import (
@@ -824,7 +826,14 @@ def merge_states(component_states):
     return rval
 
 
-def summarize_jobs_to_dict(sa_session, jobs_source):
+class JobsSummary(TypedDict):
+    populated_state: str
+    states: Dict[str, int]
+    model: str
+    id: int
+
+
+def summarize_jobs_to_dict(sa_session, jobs_source) -> Optional[JobsSummary]:
     """Produce a summary of jobs for job summary endpoints.
 
     :type   jobs_source: a Job or ImplicitCollectionJobs or None
@@ -833,7 +842,7 @@ def summarize_jobs_to_dict(sa_session, jobs_source):
     :rtype:     dict
     :returns:   dictionary containing job summary information
     """
-    rval = None
+    rval: Optional[JobsSummary] = None
     if jobs_source is None:
         pass
     elif isinstance(jobs_source, model.Job):
diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
index 820354bb8857..226bbcf7e0f9 100644
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -618,7 +618,7 @@ def get_reset_token(self, trans, email):
         reset_user = get_user_by_email(trans.sa_session, email, self.app.model.User)
         if not reset_user and email != email.lower():
             reset_user = self._get_user_by_email_case_insensitive(trans.sa_session, email)
-        if reset_user:
+        if reset_user and not reset_user.deleted:
             prt = self.app.model.PasswordResetToken(reset_user)
             trans.sa_session.add(prt)
             with transaction(trans.sa_session):
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index 7f57f698e5f2..1259dd7719ad 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -1416,7 +1416,7 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
         If `allow_upgrade`, the workflow and sub-workflows might use updated tool versions when refactoring.
         """
         annotation_str = ""
-        tag_str = ""
+        tags_list = []
         annotation_owner = None
         if stored is not None:
             if stored.id:
@@ -1427,7 +1427,7 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
                     or self.get_item_annotation_str(trans.sa_session, annotation_owner, stored)
                     or ""
                 )
-                tag_str = stored.make_tag_string_list()
+                tags_list = stored.make_tag_string_list()
             else:
                 # dry run with flushed workflow objects, just use the annotation
                 annotations = stored.annotations
@@ -1440,7 +1440,7 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
         data["format-version"] = "0.1"
         data["name"] = workflow.name
         data["annotation"] = annotation_str
-        data["tags"] = tag_str
+        data["tags"] = tags_list
         if workflow.uuid is not None:
             data["uuid"] = str(workflow.uuid)
         steps: Dict[int, Dict[str, Any]] = {}
@@ -1856,10 +1856,14 @@ def __load_subworkflow_from_step_dict(
         embedded_subworkflow = step_dict.get("subworkflow", None)
         subworkflow_id = step_dict.get("content_id", None)
         if embedded_subworkflow and subworkflow_id:
-            raise Exception("Subworkflow step defines both subworkflow and content_id, only one may be specified.")
+            raise exceptions.RequestParameterInvalidException(
+                "Subworkflow step defines both subworkflow and content_id, only one may be specified."
+            )
 
         if not embedded_subworkflow and not subworkflow_id:
-            raise Exception("Subworkflow step must define either subworkflow or content_id.")
+            raise exceptions.RequestParameterInvalidException(
+                "Subworkflow step must define either subworkflow or content_id."
+            )
 
         if embedded_subworkflow:
             assert not dry_run
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 07a2eadd6f40..586543f0f9c4 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -7665,7 +7665,7 @@ def get_internal_version(self, version):
         if version is None:
             return self.latest_workflow
         if len(self.workflows) <= version:
-            raise Exception("Version does not exist")
+            raise galaxy.exceptions.RequestParameterInvalidException("Version does not exist")
         return list(reversed(self.workflows))[version]
 
     def version_of(self, workflow):
@@ -8922,7 +8922,7 @@ def to_dict(self, view="collection", value_mapper=None, step_details=False, lega
             for input_step_parameter in self.input_step_parameters:
                 label = input_step_parameter.workflow_step.label
                 if not label:
-                    continue
+                    label = f"{input_step_parameter.workflow_step.order_index + 1}: Unnamed parameter"
                 input_parameters[label] = {
                     "parameter_value": input_step_parameter.parameter_value,
                     "label": label,
diff --git a/lib/galaxy/model/custom_types.py b/lib/galaxy/model/custom_types.py
index f36b4b9a6130..762c203eade4 100644
--- a/lib/galaxy/model/custom_types.py
+++ b/lib/galaxy/model/custom_types.py
@@ -32,7 +32,7 @@ class SafeJsonEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, numpy.int_):
             return int(obj)
-        elif isinstance(obj, numpy.float_):
+        elif isinstance(obj, numpy.float64):
             return float(obj)
         elif isinstance(obj, bytes):
             return unicodify(obj)
diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py
index 212515d230fc..2fb7f386be7e 100644
--- a/lib/galaxy/model/store/discover.py
+++ b/lib/galaxy/model/store/discover.py
@@ -38,6 +38,10 @@
 from galaxy.util.hash_util import HASH_NAME_MAP
 
 if TYPE_CHECKING:
+    from galaxy.job_execution.output_collect import (
+        DatasetCollector,
+        ToolMetadataDatasetCollector,
+    )
     from galaxy.model.store import ModelExportStore
 
 log = logging.getLogger(__name__)
@@ -50,7 +54,7 @@ class MaxDiscoveredFilesExceededError(ValueError):
     pass
 
 
-CollectorT = Any  # TODO: setup an interface for these file collectors data classes.
+CollectorT = Union["DatasetCollector", "ToolMetadataDatasetCollector"]
 
 
 class ModelPersistenceContext(metaclass=abc.ABCMeta):
@@ -1058,19 +1062,21 @@ def name(self):
         return self.as_dict.get("name")
 
     @property
-    def dbkey(self):
-        return self.as_dict.get("dbkey", getattr(self.collector, "default_dbkey", "?"))
+    def dbkey(self) -> str:
+        return self.as_dict.get("dbkey", self.collector and self.collector.default_dbkey or "?")
 
     @property
-    def ext(self):
-        return self.as_dict.get("ext", getattr(self.collector, "default_ext", "data"))
+    def ext(self) -> str:
+        return self.as_dict.get("ext", self.collector and self.collector.default_ext or "data")
 
     @property
-    def visible(self):
+    def visible(self) -> bool:
         try:
             return self.as_dict["visible"].lower() == "visible"
         except KeyError:
-            return getattr(self.collector, "default_visible", True)
+            if self.collector and self.collector.default_visible is not None:
+                return self.collector.default_visible
+            return True
 
     @property
     def link_data(self):
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index f5510d3f4933..e6e92e79334e 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -950,6 +950,7 @@ class HDAObject(Model, WithModelClass):
     tags: List[str]
     copied_from_ldda_id: Optional[EncodedDatabaseIdField] = None
     accessible: Optional[bool] = None
+    purged: bool
     model_config = ConfigDict(extra="allow")
 
 
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index cfb53b38bf7c..95e70392029c 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -785,31 +785,6 @@ def register(self, email=None, password=None, username=None, confirm=None, asser
         elif assert_valid:
             self.wait_for_logged_in()
 
-            # Code below previously was needed because there was a bug that would prevent the masthead from changing,
-            # the bug seems maybe to be fixed though - so we could consider eliminating these extra checks to speed
-            # up tests.
-            self.home()
-            self.wait_for_logged_in()
-            self.click_masthead_user()
-            # Make sure the user menu was dropped down
-            user_menu = self.components.masthead.user_menu.wait_for_visible()
-            try:
-                username_element = self.components.masthead.username.wait_for_visible()
-            except SeleniumTimeoutException as e:
-                menu_items = user_menu.find_elements(By.CSS_SELECTOR, "li a")
-                menu_text = [mi.text for mi in menu_items]
-                message = f"Failed to find logged in message in menu items {', '.join(menu_text)}"
-                raise self.prepend_timeout_message(e, message)
-
-            text = username_element.text
-            assert username in text
-            user_object = self.get_logged_in_user()
-            assert user_object and "email" in user_object
-            assert user_object["email"] == email
-
-            # clicking away no longer closes menu post Masthead -> VueJS
-            self.click_masthead_user()
-
     def wait_for_logged_in(self):
         try:
             self.components.masthead.logged_in_only.wait_for_visible()
@@ -1262,47 +1237,41 @@ def workflow_editor_click_save(self):
 
     def navigate_to_histories_page(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.histories.histories.wait_for_present()
 
     def navigate_to_histories_shared_with_me_page(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.shared_histories.tab.wait_for_and_click()
 
     def navigate_to_user_preferences(self):
         self.home()
-        self.click_masthead_user()
+        self.components.masthead.user.wait_for_and_click()
         self.components.masthead.preferences.wait_for_and_click()
 
     def navigate_to_invocations(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.invocations.wait_for_and_click()
+        self.components.invocations.activity.wait_for_and_click()
+        self.components.invocations.activity_expand.wait_for_and_click()
 
     def navigate_to_pages(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.pages.wait_for_and_click()
+        self.components.pages.activity.wait_for_and_click()
 
     def navigate_to_published_workflows(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.workflows.wait_for_and_click()
+        self.components.workflows.activity.wait_for_and_click()
         self.components.workflows.published_tab.wait_for_and_click()
 
     def navigate_to_published_histories(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.published_histories.tab.wait_for_and_click()
 
-    def navigate_to_published_pages(self):
+    def navigate_to_tools(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.pages.wait_for_and_click()
+        self.components.tools.activity.wait_for_and_click()
 
     def admin_open(self):
         self.components.admin.activity.wait_for_and_click()
@@ -1354,8 +1323,7 @@ def create_new_library(self):
 
     def libraries_open(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.libraries.wait_for_and_click()
+        self.components.libraries.activity.wait_for_and_click()
         self.components.libraries.selector.wait_for_visible()
 
     def libraries_open_with_name(self, name):
@@ -1478,7 +1446,7 @@ def pages_index_table_elements(self):
 
     def workflow_index_open(self):
         self.home()
-        self.click_masthead_workflow()
+        self.click_activity_workflow()
 
     def workflow_shared_with_me_open(self):
         self.workflow_index_open()
@@ -1738,14 +1706,8 @@ def tool_form_generate_tour(self):
     def tool_form_execute(self):
         self.components.tool_form.execute.wait_for_and_click()
 
-    def click_masthead_user(self):
-        self.components.masthead.user.wait_for_and_click()
-
-    def click_masthead_data(self):
-        self.components.masthead.data.wait_for_and_click()
-
-    def click_masthead_workflow(self):
-        self.components.masthead.workflow.wait_for_and_click()
+    def click_activity_workflow(self):
+        self.components.workflows.activity.wait_for_and_click()
 
     def click_button_new_workflow(self):
         self.wait_for_and_click(self.navigation.workflows.selectors.new_button)
@@ -2027,7 +1989,7 @@ def logout_if_needed(self):
 
     def logout(self):
         self.components.masthead.logged_in_only.wait_for_visible()
-        self.click_masthead_user()
+        self.components.masthead.user.wait_for_and_click()
         self.components.masthead.logout.wait_for_and_click()
         try:
             self.components.masthead.logged_out_only.wait_for_visible()
diff --git a/lib/galaxy/tool_util/deps/container_resolvers/__init__.py b/lib/galaxy/tool_util/deps/container_resolvers/__init__.py
index 6407ba2fa609..8a5682a3b39f 100644
--- a/lib/galaxy/tool_util/deps/container_resolvers/__init__.py
+++ b/lib/galaxy/tool_util/deps/container_resolvers/__init__.py
@@ -3,7 +3,6 @@
 from abc import (
     ABCMeta,
     abstractmethod,
-    abstractproperty,
 )
 from typing import (
     Any,
@@ -65,7 +64,8 @@ def resolve(
         of the tool and its requirements.
         """
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def resolver_type(self) -> str:
         """Short label for the type of container resolution."""
 
diff --git a/lib/galaxy/tool_util/deps/resolvers/__init__.py b/lib/galaxy/tool_util/deps/resolvers/__init__.py
index 492219665e0d..707e3e1cfa14 100644
--- a/lib/galaxy/tool_util/deps/resolvers/__init__.py
+++ b/lib/galaxy/tool_util/deps/resolvers/__init__.py
@@ -5,7 +5,6 @@
 from abc import (
     ABCMeta,
     abstractmethod,
-    abstractproperty,
 )
 from typing import (
     Any,
@@ -237,7 +236,8 @@ def _expand_specs(self, requirement):
 class SpecificationPatternDependencyResolver(SpecificationAwareDependencyResolver):
     """Implement the :class:`SpecificationAwareDependencyResolver` with a regex pattern."""
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _specification_pattern(self):
         """Pattern of URI to match against."""
 
@@ -275,7 +275,8 @@ def shell_commands(self):
         Return shell commands to enable this dependency.
         """
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def exact(self):
         """Return true if version information wasn't discarded to resolve
         the dependency.
diff --git a/lib/galaxy/tool_util/parser/interface.py b/lib/galaxy/tool_util/parser/interface.py
index 0572b8b57960..8cb859deee1e 100644
--- a/lib/galaxy/tool_util/parser/interface.py
+++ b/lib/galaxy/tool_util/parser/interface.py
@@ -401,10 +401,10 @@ def parse_optional(self, default=None):
         return self.get_bool("optional", default)
 
     def parse_dynamic_options_elem(self):
-        """Return an XML elemnt describing dynamic options."""
+        """Return an XML element describing dynamic options."""
         return None
 
-    def parse_static_options(self):
+    def parse_static_options(self) -> List[Tuple[str, str, bool]]:
         """Return list of static options if this is a select type without
         defining a dynamic options.
         """
diff --git a/lib/galaxy/tool_util/parser/output_collection_def.py b/lib/galaxy/tool_util/parser/output_collection_def.py
index 1e80ba1ea950..baf61c520cdb 100644
--- a/lib/galaxy/tool_util/parser/output_collection_def.py
+++ b/lib/galaxy/tool_util/parser/output_collection_def.py
@@ -34,7 +34,13 @@ def dataset_collector_descriptions_from_elem(elem, legacy=True):
     if num_discover_dataset_blocks == 0 and legacy:
         collectors = [DEFAULT_DATASET_COLLECTOR_DESCRIPTION]
     else:
-        collectors = [dataset_collection_description(**e.attrib) for e in primary_dataset_elems]
+        default_format = elem.attrib.get("format")
+        collectors = []
+        for e in primary_dataset_elems:
+            description_attributes = e.attrib
+            if default_format and "format" not in description_attributes and "ext" not in description_attributes:
+                description_attributes["format"] = default_format
+            collectors.append(dataset_collection_description(**description_attributes))
 
     return _validate_collectors(collectors)
 
diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py
index f70d2978b4f2..3f50c28cecea 100644
--- a/lib/galaxy/tool_util/toolbox/base.py
+++ b/lib/galaxy/tool_util/toolbox/base.py
@@ -156,7 +156,7 @@ def __init__(
         Create a toolbox from the config files named by `config_filenames`, using
         `tool_root_dir` as the base directory for finding individual tool config files.
         """
-        self._default_panel_view = default_panel_view
+        self.__default_panel_view = default_panel_view
         # The _dynamic_tool_confs list contains dictionaries storing
         # information about the tools defined in each shed-related
         # shed_tool_conf.xml file.
@@ -238,6 +238,14 @@ def to_model(self) -> ToolPanelViewModel:
         if save_integrated_tool_panel:
             self._save_integrated_tool_panel()
 
+    def _default_panel_view(self, trans):
+        config = self.app.config
+        if hasattr(config, "config_value_for_host"):
+            config_value = config.config_value_for_host("default_panel_view", trans.host)
+        else:
+            config_value = getattr(config, "default_panel_view", None)
+        return config_value or self.__default_panel_view
+
     def create_tool(self, config_file, tool_shed_repository=None, guid=None, **kwds):
         raise NotImplementedError()
 
@@ -1275,7 +1283,7 @@ def find_section_id(self, tool_panel_section_id):
     def tool_panel_contents(self, trans, view=None, **kwds):
         """Filter tool_panel contents for displaying for user."""
         if view is None:
-            view = self._default_panel_view
+            view = self._default_panel_view(trans)
         if view not in self._tool_panel_view_rendered:
             raise RequestParameterInvalidException(f"No panel view {view} found.")
         filter_method = self._build_filter_method(trans)
@@ -1338,7 +1346,7 @@ def to_panel_view(self, trans, view="default_panel_view", **kwds):
             {section_id: { section but with .tools=List[all tool ids] }, ...}}
         """
         if view == "default_panel_view":
-            view = self._default_panel_view
+            view = self._default_panel_view(trans)
         view_contents: Dict[str, Dict] = {}
         panel_elts = self.tool_panel_contents(trans, view=view, **kwds)
         for elt in panel_elts:
diff --git a/lib/galaxy/tool_util/verify/asserts/hdf5.py b/lib/galaxy/tool_util/verify/asserts/hdf5.py
index e94c61c3af04..ddbbcdd35cda 100644
--- a/lib/galaxy/tool_util/verify/asserts/hdf5.py
+++ b/lib/galaxy/tool_util/verify/asserts/hdf5.py
@@ -21,7 +21,7 @@ def assert_has_h5_attribute(output_bytes: bytes, key: str, value: str) -> None:
     local_attrs = h5py.File(output_temp, "r").attrs
     assert (
         key in local_attrs and str(local_attrs[key]) == value
-    ), f"Not a HDF5 file or H5 attributes do not match:\n\t{list(local_attrs.items())}\n\n\t({key} : {value})"
+    ), f"Not a HDF5 file or H5 attributes do not match:\n\t{[(key, str(value)) for key, value in local_attrs.items()]}\n\n\t({key} : {value})"
 
 
 # TODO the function actually queries groups. so the function and argument name are misleading
diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index 39d07f0cc8b2..73558250251f 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -5641,11 +5641,13 @@ The default is ``galaxy.json``.
   <xs:attributeGroup name="OutputCommon">
     <xs:attribute name="format" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">The short name for the output datatype.
-The valid values for format can be found in
+        <xs:documentation xml:lang="en"><![CDATA[
+The short name for the output datatype. The valid values for format can be found in
 [/config/datatypes_conf.xml.sample](https://github.com/galaxyproject/galaxy/blob/dev/config/datatypes_conf.xml.sample)
-(e.g. ``format="pdf"`` or ``format="fastqsanger"``). For collections this is the default format for all included
-elements. Note that the format specified here is ignored for discovered data sets.</xs:documentation>
+(e.g. ``format="pdf"`` or ``format="fastqsanger"``). For collections this is the default
+format for all included elements. Note that the format specified here is ignored for
+discovered data sets on Galaxy versions prior to 24.0 and should be specified using the ``<discovered_data>`` tag set.
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="format_source" type="xs:string">
diff --git a/lib/galaxy/tools/parameters/validation.py b/lib/galaxy/tools/parameters/validation.py
index cf02d86c56b5..6334fd95f8b8 100644
--- a/lib/galaxy/tools/parameters/validation.py
+++ b/lib/galaxy/tools/parameters/validation.py
@@ -165,7 +165,7 @@ def __init__(self, message, range_min, range_max, exclude_min=False, exclude_max
             op1 = "<"
         if self.exclude_max:
             op2 = "<"
-        expression = f"float('{self.min}') {op1} value {op2} float('{self.max}')"
+        expression = f"float('{self.min}') {op1} float(value) {op2} float('{self.max}')"
         if message is None:
             message = f"Value ('%s') must {'not ' if negate == 'true' else ''}fulfill {expression}"
         super().__init__(message, expression, negate)
diff --git a/lib/galaxy/web_stack/message.py b/lib/galaxy/web_stack/message.py
index f7ef7f7d2ddf..15259b4cc50e 100644
--- a/lib/galaxy/web_stack/message.py
+++ b/lib/galaxy/web_stack/message.py
@@ -68,7 +68,9 @@ def _merge_class_tuples(self):
         names = set()
         for cls in reversed(self.__class__.mro()):
             names.update(
-                [x for x in dir(cls) if x.startswith("_") and not x.startswith("__") and type(getattr(cls, x)) == tuple]
+                x
+                for x in dir(cls)
+                if x.startswith("_") and not x.startswith("__") and type(getattr(cls, x)) == tuple  # noqa: E721
             )
         for name in names:
             setattr(self.__class__, name.lstrip("_"), property(lambda self, name=name: self._get_list_from_mro(name)))
diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py
index 38f346bffe8e..ea78cd9f5696 100644
--- a/lib/galaxy/webapps/galaxy/api/tools.py
+++ b/lib/galaxy/webapps/galaxy/api/tools.py
@@ -185,7 +185,7 @@ def panel_views(self, trans: GalaxyWebTransaction, **kwds):
         """
 
         rval = {}
-        rval["default_panel_view"] = self.app.toolbox._default_panel_view
+        rval["default_panel_view"] = self.app.toolbox._default_panel_view(trans)
         rval["views"] = self.app.toolbox.panel_view_dicts()
         return rval
 
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 64d1d2a4c0ba..5de6e9d9b47c 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -21,7 +21,7 @@
     Response,
     status,
 )
-from gxformat2._yaml import ordered_dump
+from gxformat2.yaml import ordered_dump
 from pydantic import (
     UUID1,
     UUID4,
diff --git a/lib/galaxy/work/context.py b/lib/galaxy/work/context.py
index 8e4fc74afc21..025fb7aac920 100644
--- a/lib/galaxy/work/context.py
+++ b/lib/galaxy/work/context.py
@@ -89,15 +89,18 @@ def set_user(self, user):
 class GalaxyAbstractRequest:
     """Abstract interface to provide access to some request properties."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def base(self) -> str:
         """Base URL of the request."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def host(self) -> str:
         """The host address."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def is_secure(self) -> bool:
         """Was this a secure (https) request."""
 
@@ -109,7 +112,8 @@ def get_cookie(self, name):
 class GalaxyAbstractResponse:
     """Abstract interface to provide access to some response utilities."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def headers(self) -> dict:
         """The response headers."""
 
diff --git a/lib/galaxy/workflow/refactor/execute.py b/lib/galaxy/workflow/refactor/execute.py
index fc38a9351468..264fa843d830 100644
--- a/lib/galaxy/workflow/refactor/execute.py
+++ b/lib/galaxy/workflow/refactor/execute.py
@@ -531,6 +531,9 @@ def _patch_step(self, execution, step, step_def):
                 if upgrade_input["name"] == input_name:
                     matching_input = upgrade_input
                     break
+                elif step.when_expression and f"inputs.{input_name}" in step.when_expression:
+                    # TODO: eventually track step inputs more formally
+                    matching_input = upgrade_input
 
             # In the future check parameter type, format, mapping status...
             if matching_input is None:
diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 3317ae550a38..8331271c38a5 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -7704,6 +7704,13 @@ def _all_user_invocation_ids(self):
         invocation_ids = [i["id"] for i in all_invocations_for_user.json()]
         return invocation_ids
 
+    def test_subworkflow_tags(self):
+        workflow = self.workflow_populator.load_workflow_from_resource("test_subworkflow_with_tags")
+        workflow_id = self.workflow_populator.create_workflow(workflow)
+        downloaded_workflow = self._download_workflow(workflow_id)
+        subworkflow = downloaded_workflow["steps"]["1"]["subworkflow"]
+        assert subworkflow["tags"] == []
+
 
 class TestAdminWorkflowsApi(BaseWorkflowsApiTestCase):
     require_admin_user = True
diff --git a/lib/galaxy_test/base/data/test_subworkflow_with_tags.ga b/lib/galaxy_test/base/data/test_subworkflow_with_tags.ga
new file mode 100644
index 000000000000..9b5fb172320a
--- /dev/null
+++ b/lib/galaxy_test/base/data/test_subworkflow_with_tags.ga
@@ -0,0 +1,134 @@
+{
+    "a_galaxy_workflow": "true",
+    "annotation": "Test main ",
+    "comments": [],
+    "format-version": "0.1",
+    "name": "Unnamed Workflow",
+    "report": {
+        "markdown": "\n# Workflow Execution Report\n\n## Workflow Inputs\n```galaxy\ninvocation_inputs()\n```\n\n## Workflow Outputs\n```galaxy\ninvocation_outputs()\n```\n\n## Workflow\n```galaxy\nworkflow_display()\n```\n"
+    },
+    "steps": {
+        "0": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 0,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "left": 0,
+                "top": 0
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false, \"tag\": null}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "967583e9-d2a6-444a-ba31-6fb749d03f9e",
+            "when": null,
+            "workflow_outputs": []
+        },
+        "1": {
+            "annotation": "",
+            "id": 1,
+            "input_connections": {
+                "0:Input dataset": {
+                    "id": 0,
+                    "input_subworkflow_step_id": 0,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "Workflow with tags",
+            "outputs": [],
+            "position": {
+                "left": 249,
+                "top": 51
+            },
+            "subworkflow": {
+                "a_galaxy_workflow": "true",
+                "annotation": "",
+                "comments": [],
+                "format-version": "0.1",
+                "name": "Workflow with tags",
+                "report": {
+                    "markdown": "\n# Workflow Execution Report\n\n## Workflow Inputs\n```galaxy\ninvocation_inputs()\n```\n\n## Workflow Outputs\n```galaxy\ninvocation_outputs()\n```\n\n## Workflow\n```galaxy\nworkflow_display()\n```\n"
+                },
+                "steps": {
+                    "0": {
+                        "annotation": "",
+                        "content_id": null,
+                        "errors": null,
+                        "id": 0,
+                        "input_connections": {},
+                        "inputs": [],
+                        "label": null,
+                        "name": "Input dataset",
+                        "outputs": [],
+                        "position": {
+                            "left": 0,
+                            "top": 0.0
+                        },
+                        "tool_id": null,
+                        "tool_state": "{\"optional\": false, \"tag\": null}",
+                        "tool_version": null,
+                        "type": "data_input",
+                        "uuid": "eca9b088-ff50-4253-8387-01512f03ff2f",
+                        "when": null,
+                        "workflow_outputs": []
+                    },
+                    "1": {
+                        "annotation": "",
+                        "content_id": "addValue",
+                        "errors": null,
+                        "id": 1,
+                        "input_connections": {
+                            "input": {
+                                "id": 0,
+                                "output_name": "output"
+                            }
+                        },
+                        "inputs": [
+                            {
+                                "description": "runtime parameter for tool Add column",
+                                "name": "input"
+                            }
+                        ],
+                        "label": null,
+                        "name": "Add column",
+                        "outputs": [
+                            {
+                                "name": "out_file1",
+                                "type": "input"
+                            }
+                        ],
+                        "position": {
+                            "left": 123,
+                            "top": 112.0
+                        },
+                        "post_job_actions": {},
+                        "tool_id": "addValue",
+                        "tool_state": "{\"exp\": \"1\", \"input\": {\"__class__\": \"RuntimeValue\"}, \"iterate\": \"no\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+                        "tool_version": "1.0.0",
+                        "type": "tool",
+                        "uuid": "7016e754-149b-402a-bb17-eb6cd4b1ab0a",
+                        "when": null,
+                        "workflow_outputs": []
+                    }
+                },
+                "uuid": "c33370a9-188f-4af8-bfcc-137c577c79ba"
+            },
+            "tool_id": null,
+            "type": "subworkflow",
+            "uuid": "90bdcd13-418a-49da-847e-02926942bf4b",
+            "when": null,
+            "workflow_outputs": []
+        }
+    },
+    "tags": [],
+    "uuid": "64d7fac3-6402-412b-9db6-490ffc18e129",
+    "version": 1
+}
\ No newline at end of file
diff --git a/lib/galaxy_test/base/populators.py b/lib/galaxy_test/base/populators.py
index d373b23d389d..1e284135937b 100644
--- a/lib/galaxy_test/base/populators.py
+++ b/lib/galaxy_test/base/populators.py
@@ -76,7 +76,7 @@
     convert_and_import_workflow,
     ImporterGalaxyInterface,
 )
-from gxformat2._yaml import ordered_load
+from gxformat2.yaml import ordered_load
 from requests import Response
 from rocrate.rocrate import ROCrate
 from typing_extensions import Literal
diff --git a/lib/galaxy_test/selenium/test_change_password.py b/lib/galaxy_test/selenium/test_change_password.py
index 7b8aae510509..8ab3e9f8e311 100644
--- a/lib/galaxy_test/selenium/test_change_password.py
+++ b/lib/galaxy_test/selenium/test_change_password.py
@@ -10,8 +10,7 @@ def test_change_password(self):
         self.home()
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
         new_password = self._get_random_password()
         self.fill_input_fields(self.default_password, new_password, new_password)
@@ -57,8 +56,7 @@ def test_new_password_same_password(self):
     def register_and_change_password(self):
         self.home()
         self.register()
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
 
     def fill_input_fields(self, current, password, confirm):
diff --git a/lib/galaxy_test/selenium/test_published_pages.py b/lib/galaxy_test/selenium/test_published_pages.py
index d8813f323ba1..c73495dd588f 100644
--- a/lib/galaxy_test/selenium/test_published_pages.py
+++ b/lib/galaxy_test/selenium/test_published_pages.py
@@ -7,7 +7,7 @@
 class TestPublishedPagesGrid(SharedStateSeleniumTestCase):
     @selenium_test
     def test_index(self):
-        self.navigate_to_published_pages()
+        self.navigate_to_pages()
         assert len(self.get_grid_entry_names("#pages-published-grid")) == 2
 
     def setup_shared_state(self):
diff --git a/lib/galaxy_test/selenium/test_sign_out.py b/lib/galaxy_test/selenium/test_sign_out.py
index 2b3a715b386e..c08ed95761d5 100644
--- a/lib/galaxy_test/selenium/test_sign_out.py
+++ b/lib/galaxy_test/selenium/test_sign_out.py
@@ -11,8 +11,7 @@ class TestSignOut(SeleniumTestCase):
     def test_sign_out(self):
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.sign_out.wait_for_and_click()
         self.components.sign_out.cancel_button.wait_for_and_click()
         assert self.is_logged_in()
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 7aefe2ef269d..be5433ef3f18 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -899,22 +899,18 @@ def assert_workflow_bookmarked_status(target_status):
             assert status == target_status
 
         new_workflow_name = self.workflow_create_new(clear_placeholder=True)
+        self.components.workflow_editor.canvas_body.wait_for_visible()
+        self.wait_for_selector_absent_or_hidden(self.modal_body_selector())
 
         # Assert workflow not initially bookmarked.
+        self.navigate_to_tools()
         assert_workflow_bookmarked_status(False)
 
-        self.components.workflow_editor.canvas_body.wait_for_visible()
-        self.wait_for_selector_absent_or_hidden(self.modal_body_selector())
-        self.components.masthead.workflow.wait_for_and_click()
-
-        self.sleep_for(self.wait_types.UX_RENDER)
+        self.click_activity_workflow()
         self.components.workflows.bookmark_link(action="add").wait_for_and_click()
-        self.components.masthead.workflow.wait_for_and_click()
-        self.sleep_for(self.wait_types.UX_TRANSITION)
 
         # search for bookmark in tools menu
-        self.components.tool_panel.search.wait_for_and_send_keys(new_workflow_name)
-        self.sleep_for(self.wait_types.UX_RENDER)
+        self.navigate_to_tools()
         assert_workflow_bookmarked_status(True)
 
     def tab_to(self, accessible_name, direction="forward"):
diff --git a/lib/tool_shed/context.py b/lib/tool_shed/context.py
index 613c52b79a36..b936a7b7bf93 100644
--- a/lib/tool_shed/context.py
+++ b/lib/tool_shed/context.py
@@ -24,7 +24,8 @@ class ProvidesAppContext(Protocol):
     Mixed in class must provide `app` property.
     """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def app(self) -> ToolShedApp:
         """Provide access to the shed ``app`` object."""
 
@@ -54,7 +55,8 @@ class ProvidesUserContext(ProvidesAppContext, Protocol):
     properties.
     """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def user(self) -> Optional[User]:
         """Provide access to the user object."""
 
@@ -74,7 +76,8 @@ def user_is_bootstrap_admin(self) -> bool:
 
 
 class ProvidesRepositoriesContext(ProvidesUserContext, Protocol):
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def repositories_hostname(self) -> str:
         """Provide access to hostname used by target mercurial server."""
 
@@ -86,16 +89,19 @@ def get_galaxy_session(self) -> Optional[GalaxySession]: ...
     @abc.abstractmethod
     def set_galaxy_session(self, galaxy_session: GalaxySession): ...
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def request(self) -> GalaxyAbstractRequest: ...
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def response(self) -> GalaxyAbstractResponse: ...
 
     @abc.abstractmethod
     def url_builder(self): ...
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def session_csrf_token(self) -> str: ...
 
 
diff --git a/lib/tool_shed/test/base/browser.py b/lib/tool_shed/test/base/browser.py
index 559ce7468cf3..f20804eecc09 100644
--- a/lib/tool_shed/test/base/browser.py
+++ b/lib/tool_shed/test/base/browser.py
@@ -36,7 +36,8 @@ def submit_form(self, form_no=-1, button="runtool_btn", form=None, **kwd):
     def submit_form_with_name(self, form_name: str, button="runtool_btn", **kwd):
         """Submit the target button."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def is_twill(self) -> bool:
         """Return whether this is a twill browser."""
 
diff --git a/lib/tool_shed/test/base/twilltestcase.py b/lib/tool_shed/test/base/twilltestcase.py
index 87eaf2c3ab8d..a8414ff3dc69 100644
--- a/lib/tool_shed/test/base/twilltestcase.py
+++ b/lib/tool_shed/test/base/twilltestcase.py
@@ -150,11 +150,13 @@ def update_installed_repository(
     ) -> Dict[str, Any]:
         """"""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def tool_data_path(self) -> str:
         """"""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def shed_tool_data_table_conf(self) -> str:
         """"""
 
diff --git a/lib/tool_shed/webapp/templates/galaxy_client_app.mako b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
index a8ed317e27bf..846fcc7f60f9 100644
--- a/lib/tool_shed/webapp/templates/galaxy_client_app.mako
+++ b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
@@ -72,7 +72,7 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
 
 <%def name="config_plausible_analytics(plausible_server, plausible_domain)">
     %if plausible_server and plausible_domain:
-        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
+        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/script.js"></script>
     %else:
         <script>console.warn("Missing plausible server or plausible domain");</script>
     %endif
diff --git a/packages/app/HISTORY.rst b/packages/app/HISTORY.rst
index c68d6c7dbe2f..09d4be63a792 100644
--- a/packages/app/HISTORY.rst
+++ b/packages/app/HISTORY.rst
@@ -4,11 +4,142 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Unpin social-auth-core dependency by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17607 <https://github.com/galaxyproject/galaxy/pull/17607>`_
+* Dynamic tool fixes by `@dcore94 <https://github.com/dcore94>`_ in `#18085 <https://github.com/galaxyproject/galaxy/pull/18085>`_
+* Fix for unexpected OIDC XML validation error by `@Edmontosaurus <https://github.com/Edmontosaurus>`_ in `#18106 <https://github.com/galaxyproject/galaxy/pull/18106>`_
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+* Small bug fixes for user data plugins by `@jmchilton <https://github.com/jmchilton>`_ in `#18246 <https://github.com/galaxyproject/galaxy/pull/18246>`_
+* Fix handler: access to result row items changed in SA2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#18274 <https://github.com/galaxyproject/galaxy/pull/18274>`_
+* Fix various packages' issues by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18301 <https://github.com/galaxyproject/galaxy/pull/18301>`_
+* Adapt Tool prediction API to Transformer-based deep learning architecture by `@anuprulez <https://github.com/anuprulez>`_ in `#18305 <https://github.com/galaxyproject/galaxy/pull/18305>`_
+* Fix empty usernames in database + bug in username generation by `@jdavcs <https://github.com/jdavcs>`_ in `#18379 <https://github.com/galaxyproject/galaxy/pull/18379>`_
+* Add TypedDict for JobsSummary by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18418 <https://github.com/galaxyproject/galaxy/pull/18418>`_
+* Pin pydantic to >=2.7.4 by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18423 <https://github.com/galaxyproject/galaxy/pull/18423>`_
+* Update mercurial to non-yanked 6.7.4 by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18434 <https://github.com/galaxyproject/galaxy/pull/18434>`_
+* Fix dropped when_expression on step upgrade by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18446 <https://github.com/galaxyproject/galaxy/pull/18446>`_
+* Improve workflow-related exception reporting by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18447 <https://github.com/galaxyproject/galaxy/pull/18447>`_
+* Fix subwofklow tags serialization type by `@arash77 <https://github.com/arash77>`_ in `#18456 <https://github.com/galaxyproject/galaxy/pull/18456>`_
+* Disable password reset for deleted users [GCC2024_COFEST]  by `@laperlej <https://github.com/laperlej>`_ in `#18459 <https://github.com/galaxyproject/galaxy/pull/18459>`_
+* Add input extra files to `get_input_fnames` by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18462 <https://github.com/galaxyproject/galaxy/pull/18462>`_
+
+============
+Enhancements
+============
+
+* Only include tool stdout/stderr in HDA info by `@natefoo <https://github.com/natefoo>`_ in `#16730 <https://github.com/galaxyproject/galaxy/pull/16730>`_
+* Adding object store plugin for Rucio by `@SergeyYakubov <https://github.com/SergeyYakubov>`_ in `#17156 <https://github.com/galaxyproject/galaxy/pull/17156>`_
+* Enable all-vs-all collection analysis patterns. by `@jmchilton <https://github.com/jmchilton>`_ in `#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`_
+* Add onedata objectstore by `@bwalkowi <https://github.com/bwalkowi>`_ in `#17540 <https://github.com/galaxyproject/galaxy/pull/17540>`_
+* Type annotation improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17601 <https://github.com/galaxyproject/galaxy/pull/17601>`_
+* Type annotation and CWL-related improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17630 <https://github.com/galaxyproject/galaxy/pull/17630>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17764 <https://github.com/galaxyproject/galaxy/pull/17764>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17819 <https://github.com/galaxyproject/galaxy/pull/17819>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17870 <https://github.com/galaxyproject/galaxy/pull/17870>`_
+* Add `email` notifications channel by `@davelopez <https://github.com/davelopez>`_ in `#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`_
+* Model edits and bug fixes by `@jdavcs <https://github.com/jdavcs>`_ in `#17922 <https://github.com/galaxyproject/galaxy/pull/17922>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17923 <https://github.com/galaxyproject/galaxy/pull/17923>`_
+* Model typing and SA2.0 follow-up by `@jdavcs <https://github.com/jdavcs>`_ in `#17958 <https://github.com/galaxyproject/galaxy/pull/17958>`_
+* Error reporting unit tests by `@jmchilton <https://github.com/jmchilton>`_ in `#17968 <https://github.com/galaxyproject/galaxy/pull/17968>`_
+* Make urgent notifications mandatory by `@davelopez <https://github.com/davelopez>`_ in `#17975 <https://github.com/galaxyproject/galaxy/pull/17975>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17982 <https://github.com/galaxyproject/galaxy/pull/17982>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Add Zenodo integration by `@davelopez <https://github.com/davelopez>`_ in `#18022 <https://github.com/galaxyproject/galaxy/pull/18022>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18035 <https://github.com/galaxyproject/galaxy/pull/18035>`_
+* Add stronger type annotations in file sources + refactoring by `@davelopez <https://github.com/davelopez>`_ in `#18050 <https://github.com/galaxyproject/galaxy/pull/18050>`_
+* Add pagination support to Files Source plugins by `@davelopez <https://github.com/davelopez>`_ in `#18059 <https://github.com/galaxyproject/galaxy/pull/18059>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Ensure history `update_time` is set when exporting by `@davelopez <https://github.com/davelopez>`_ in `#18086 <https://github.com/galaxyproject/galaxy/pull/18086>`_
+* Overhaul Azure storage infrastructure. by `@jmchilton <https://github.com/jmchilton>`_ in `#18087 <https://github.com/galaxyproject/galaxy/pull/18087>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18095 <https://github.com/galaxyproject/galaxy/pull/18095>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18125 <https://github.com/galaxyproject/galaxy/pull/18125>`_
+* Revises handling of warnings in the workflow run form by `@guerler <https://github.com/guerler>`_ in `#18126 <https://github.com/galaxyproject/galaxy/pull/18126>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Update s3fs dependency. by `@jmchilton <https://github.com/jmchilton>`_ in `#18135 <https://github.com/galaxyproject/galaxy/pull/18135>`_
+* More unit testing for object store stuff. by `@jmchilton <https://github.com/jmchilton>`_ in `#18136 <https://github.com/galaxyproject/galaxy/pull/18136>`_
+* Harden User Object Store and File Source Creation by `@jmchilton <https://github.com/jmchilton>`_ in `#18172 <https://github.com/galaxyproject/galaxy/pull/18172>`_
+* Fix boto3-stubs typecheck dependency by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18173 <https://github.com/galaxyproject/galaxy/pull/18173>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+* Onedada object store and files source stability fixes by `@bwalkowi <https://github.com/bwalkowi>`_ in `#18372 <https://github.com/galaxyproject/galaxy/pull/18372>`_
+* Allow running and editing workflows for specific versions by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18378 <https://github.com/galaxyproject/galaxy/pull/18378>`_
+
+=============
+Other changes
+=============
+
+* Chore: remove repetitive words by `@tianzedavid <https://github.com/tianzedavid>`_ in `#18076 <https://github.com/galaxyproject/galaxy/pull/18076>`_
+* Fix #18316 (anonymous file sources) by `@jmchilton <https://github.com/jmchilton>`_ in `#18352 <https://github.com/galaxyproject/galaxy/pull/18352>`_
+* Merge 24.0 into 24.1 by `@jdavcs <https://github.com/jdavcs>`_ in `#18353 <https://github.com/galaxyproject/galaxy/pull/18353>`_
+* Merge 24.0 into 24.1 by `@jdavcs <https://github.com/jdavcs>`_ in `#18365 <https://github.com/galaxyproject/galaxy/pull/18365>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Raise exception if collection elements missing during download by `@jdavcs <https://github.com/jdavcs>`_ in `#18094 <https://github.com/galaxyproject/galaxy/pull/18094>`_
+* Allow purge query param, deprecate purge body param by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18105 <https://github.com/galaxyproject/galaxy/pull/18105>`_
+* Backport OIDC schema fix by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18111 <https://github.com/galaxyproject/galaxy/pull/18111>`_
+* Don't log exception if cancelled slurm job doesn't have stderr file by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18121 <https://github.com/galaxyproject/galaxy/pull/18121>`_
+* Downgrade missing output file in working directory to warning for failed jobs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18123 <https://github.com/galaxyproject/galaxy/pull/18123>`_
+* Fix data default values not getting added to history by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18132 <https://github.com/galaxyproject/galaxy/pull/18132>`_
+* Drop redundant error message by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18156 <https://github.com/galaxyproject/galaxy/pull/18156>`_
+* Emit warning when user-cancelled job already complete by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18178 <https://github.com/galaxyproject/galaxy/pull/18178>`_
+* Avoid object store path lookup when constructing JobState object by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18190 <https://github.com/galaxyproject/galaxy/pull/18190>`_
+* Add string cast for dbkey / genome_build by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18207 <https://github.com/galaxyproject/galaxy/pull/18207>`_
+* Check dataset state when attempting to acces dataset contents by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18214 <https://github.com/galaxyproject/galaxy/pull/18214>`_
+* Don't set dataset peek for errored jobs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18231 <https://github.com/galaxyproject/galaxy/pull/18231>`_
+* Raise exception when extracting dataset from collection without datasets by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18249 <https://github.com/galaxyproject/galaxy/pull/18249>`_
+* Skip tests if toolshed, dx.doi not responding by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18250 <https://github.com/galaxyproject/galaxy/pull/18250>`_
+* Don't attempt to download purged datasets by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18278 <https://github.com/galaxyproject/galaxy/pull/18278>`_
+* Check various preconditions in FeatureLocationIndexDataProvider by `@davelopez <https://github.com/davelopez>`_ in `#18283 <https://github.com/galaxyproject/galaxy/pull/18283>`_
+* Don't serialize display application links for deleted datasets by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18307 <https://github.com/galaxyproject/galaxy/pull/18307>`_
+* Downgrade doi fetch error to debug by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18330 <https://github.com/galaxyproject/galaxy/pull/18330>`_
+* Fix authentication error for anonymous users querying jobs by `@davelopez <https://github.com/davelopez>`_ in `#18333 <https://github.com/galaxyproject/galaxy/pull/18333>`_
+* Fix seek in slurm memory check by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18338 <https://github.com/galaxyproject/galaxy/pull/18338>`_
+* Do not copy purged outputs to object store by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18342 <https://github.com/galaxyproject/galaxy/pull/18342>`_
+* Kill pulsar job if job stopped on galaxy side by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18348 <https://github.com/galaxyproject/galaxy/pull/18348>`_
+* Allow DCE as outer input to to_cwl by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18349 <https://github.com/galaxyproject/galaxy/pull/18349>`_
+* Fix anonymous user job retrieval logic by `@davelopez <https://github.com/davelopez>`_ in `#18358 <https://github.com/galaxyproject/galaxy/pull/18358>`_
+* Fix update group API payload model by `@davelopez <https://github.com/davelopez>`_ in `#18374 <https://github.com/galaxyproject/galaxy/pull/18374>`_
+* Fix user's private role can be missing by `@davelopez <https://github.com/davelopez>`_ in `#18381 <https://github.com/galaxyproject/galaxy/pull/18381>`_
+* Fix null inputs in database operation tools by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18385 <https://github.com/galaxyproject/galaxy/pull/18385>`_
+* Assign default ``data`` extension on discovered collection output  by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18389 <https://github.com/galaxyproject/galaxy/pull/18389>`_
+* Fix ``get_accessible_job`` if called without session by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18400 <https://github.com/galaxyproject/galaxy/pull/18400>`_
+* Fix invocation step_job_summary for new collections by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18402 <https://github.com/galaxyproject/galaxy/pull/18402>`_
+* Really allow in-range validator for txt by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#18411 <https://github.com/galaxyproject/galaxy/pull/18411>`_
+* Fix collection map over status for dragged collections by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18416 <https://github.com/galaxyproject/galaxy/pull/18416>`_
+* Serialize purged flag for datasets in collections by `@davelopez <https://github.com/davelopez>`_ in `#18420 <https://github.com/galaxyproject/galaxy/pull/18420>`_
+
+=============
+Other changes
+=============
+
+* Minor linting cleanup by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18421 <https://github.com/galaxyproject/galaxy/pull/18421>`_
+* Replace busybox:ubuntu-14.04 image with busybox:1.36.1-glibc by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18428 <https://github.com/galaxyproject/galaxy/pull/18428>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg
index 1879c3437ee9..1184ee741978 100644
--- a/packages/app/setup.cfg
+++ b/packages/app/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-app
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
@@ -61,7 +61,7 @@ install_requires =
     paramiko!=2.9.0,!=2.9.1
     pebble
     pulsar-galaxy-lib>=0.15.0.dev0
-    pydantic>=2,!=2.6.0,!=2.6.1
+    pydantic>=2.7.4
     pysam>=0.21
     PyJWT
     PyYAML
diff --git a/packages/auth/HISTORY.rst b/packages/auth/HISTORY.rst
index e87c36a52403..ae02cb251cda 100644
--- a/packages/auth/HISTORY.rst
+++ b/packages/auth/HISTORY.rst
@@ -4,11 +4,29 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/auth/setup.cfg b/packages/auth/setup.cfg
index adad08ddb323..9e625b308946 100644
--- a/packages/auth/setup.cfg
+++ b/packages/auth/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-auth
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/config/HISTORY.rst b/packages/config/HISTORY.rst
index 746ecf383fc6..327bc9cea77b 100644
--- a/packages/config/HISTORY.rst
+++ b/packages/config/HISTORY.rst
@@ -4,11 +4,73 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Replace sample Celery result_backend in config by `@davelopez <https://github.com/davelopez>`_ in `#17949 <https://github.com/galaxyproject/galaxy/pull/17949>`_
+* Fix for unexpected OIDC XML validation error by `@Edmontosaurus <https://github.com/Edmontosaurus>`_ in `#18106 <https://github.com/galaxyproject/galaxy/pull/18106>`_
+* Fix various packages' issues by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18301 <https://github.com/galaxyproject/galaxy/pull/18301>`_
+* Rebuild Galaxy config by `@bgruening <https://github.com/bgruening>`_ in `#18325 <https://github.com/galaxyproject/galaxy/pull/18325>`_
+
+============
+Enhancements
+============
+
+* Enable all-vs-all collection analysis patterns. by `@jmchilton <https://github.com/jmchilton>`_ in `#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`_
+* Add onedata objectstore by `@bwalkowi <https://github.com/bwalkowi>`_ in `#17540 <https://github.com/galaxyproject/galaxy/pull/17540>`_
+* Add colabfold tar file datatype by `@astrovsky01 <https://github.com/astrovsky01>`_ in `#17567 <https://github.com/galaxyproject/galaxy/pull/17567>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Add `email` notifications channel by `@davelopez <https://github.com/davelopez>`_ in `#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`_
+* Update config docs about Celery by `@davelopez <https://github.com/davelopez>`_ in `#17918 <https://github.com/galaxyproject/galaxy/pull/17918>`_
+* Make urgent notifications mandatory by `@davelopez <https://github.com/davelopez>`_ in `#17975 <https://github.com/galaxyproject/galaxy/pull/17975>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add Zenodo integration by `@davelopez <https://github.com/davelopez>`_ in `#18022 <https://github.com/galaxyproject/galaxy/pull/18022>`_
+* Add support for additional media types by `@arash77 <https://github.com/arash77>`_ in `#18054 <https://github.com/galaxyproject/galaxy/pull/18054>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Add Net datatype by `@martenson <https://github.com/martenson>`_ in `#18080 <https://github.com/galaxyproject/galaxy/pull/18080>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* More unit testing for object store stuff. by `@jmchilton <https://github.com/jmchilton>`_ in `#18136 <https://github.com/galaxyproject/galaxy/pull/18136>`_
+* Tighten axt sniffer by `@martenson <https://github.com/martenson>`_ in `#18204 <https://github.com/galaxyproject/galaxy/pull/18204>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+* Onedada object store and files source stability fixes by `@bwalkowi <https://github.com/bwalkowi>`_ in `#18372 <https://github.com/galaxyproject/galaxy/pull/18372>`_
+
+=============
+Other changes
+=============
+
+* Chore: remove repetitive words by `@tianzedavid <https://github.com/tianzedavid>`_ in `#18076 <https://github.com/galaxyproject/galaxy/pull/18076>`_
+* Fix the link to the carbon config by `@bgruening <https://github.com/bgruening>`_ in `#18314 <https://github.com/galaxyproject/galaxy/pull/18314>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Backport OIDC schema fix by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18111 <https://github.com/galaxyproject/galaxy/pull/18111>`_
+* Minor fix to enable external hgweb process by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18256 <https://github.com/galaxyproject/galaxy/pull/18256>`_
+
+=============
+Other changes
+=============
+
+* Replace busybox:ubuntu-14.04 image with busybox:1.36.1-glibc by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18428 <https://github.com/galaxyproject/galaxy/pull/18428>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/config/setup.cfg b/packages/config/setup.cfg
index b1691b58d9a5..5249de2ee6ab 100644
--- a/packages/config/setup.cfg
+++ b/packages/config/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-config
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/data/HISTORY.rst b/packages/data/HISTORY.rst
index 1d3a447f88ba..a50cce52863c 100644
--- a/packages/data/HISTORY.rst
+++ b/packages/data/HISTORY.rst
@@ -4,11 +4,90 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix syntax for SA2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17663 <https://github.com/galaxyproject/galaxy/pull/17663>`_
+* Fix empty usernames in database + bug in username generation by `@jdavcs <https://github.com/jdavcs>`_ in `#18379 <https://github.com/galaxyproject/galaxy/pull/18379>`_
+* Fix `input_step_parameters` missing values that don't have a label by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18405 <https://github.com/galaxyproject/galaxy/pull/18405>`_
+* Improve workflow-related exception reporting by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18447 <https://github.com/galaxyproject/galaxy/pull/18447>`_
+
+============
+Enhancements
+============
+
+* Enable all-vs-all collection analysis patterns. by `@jmchilton <https://github.com/jmchilton>`_ in `#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`_
+* Visualizing workflow runs with an invocation graph view by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#17413 <https://github.com/galaxyproject/galaxy/pull/17413>`_
+* Better display of estimated line numbers and add number of columns for tabular by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17492 <https://github.com/galaxyproject/galaxy/pull/17492>`_
+* Enable storage management by object store by `@jmchilton <https://github.com/jmchilton>`_ in `#17500 <https://github.com/galaxyproject/galaxy/pull/17500>`_
+* Set minimal metadata also for empty bed datasets by `@wm75 <https://github.com/wm75>`_ in `#17586 <https://github.com/galaxyproject/galaxy/pull/17586>`_
+* Type annotation improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17601 <https://github.com/galaxyproject/galaxy/pull/17601>`_
+* Type annotation and CWL-related improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17630 <https://github.com/galaxyproject/galaxy/pull/17630>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Outline use of type_annotation_map to fix mypy issues by `@jmchilton <https://github.com/jmchilton>`_ in `#17902 <https://github.com/galaxyproject/galaxy/pull/17902>`_
+* Add `email` notifications channel by `@davelopez <https://github.com/davelopez>`_ in `#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`_
+* Model edits and bug fixes by `@jdavcs <https://github.com/jdavcs>`_ in `#17922 <https://github.com/galaxyproject/galaxy/pull/17922>`_
+* Model typing and SA2.0 follow-up by `@jdavcs <https://github.com/jdavcs>`_ in `#17958 <https://github.com/galaxyproject/galaxy/pull/17958>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Refactor galaxy.files plugin loading + config handling. by `@jmchilton <https://github.com/jmchilton>`_ in `#18049 <https://github.com/galaxyproject/galaxy/pull/18049>`_
+* Add stronger type annotations in file sources + refactoring by `@davelopez <https://github.com/davelopez>`_ in `#18050 <https://github.com/galaxyproject/galaxy/pull/18050>`_
+* Add support for additional media types by `@arash77 <https://github.com/arash77>`_ in `#18054 <https://github.com/galaxyproject/galaxy/pull/18054>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Script for deleting userless histories from database + testing + drop unused model testing code by `@jdavcs <https://github.com/jdavcs>`_ in `#18079 <https://github.com/galaxyproject/galaxy/pull/18079>`_
+* Add Net datatype by `@martenson <https://github.com/martenson>`_ in `#18080 <https://github.com/galaxyproject/galaxy/pull/18080>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Harden User Object Store and File Source Creation by `@jmchilton <https://github.com/jmchilton>`_ in `#18172 <https://github.com/galaxyproject/galaxy/pull/18172>`_
+* Update db revision 24.1 release tags by `@jdavcs <https://github.com/jdavcs>`_ in `#18183 <https://github.com/galaxyproject/galaxy/pull/18183>`_
+* Tighten axt sniffer by `@martenson <https://github.com/martenson>`_ in `#18204 <https://github.com/galaxyproject/galaxy/pull/18204>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+
+=============
+Other changes
+=============
+
+* Chore: remove repetitive words by `@tianzedavid <https://github.com/tianzedavid>`_ in `#18076 <https://github.com/galaxyproject/galaxy/pull/18076>`_
+* Fix import broken with forward merge by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18152 <https://github.com/galaxyproject/galaxy/pull/18152>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Downgrade count lines error to warning by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18175 <https://github.com/galaxyproject/galaxy/pull/18175>`_
+* Don't set dataset peek for errored jobs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18231 <https://github.com/galaxyproject/galaxy/pull/18231>`_
+* Transparently open compressed files in DatasetDataProvider by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18248 <https://github.com/galaxyproject/galaxy/pull/18248>`_
+* Raise exception when extracting dataset from collection without datasets by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18249 <https://github.com/galaxyproject/galaxy/pull/18249>`_
+* Set page importable to false when serializing by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18263 <https://github.com/galaxyproject/galaxy/pull/18263>`_
+* Fix first_dataset_element type hint by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18284 <https://github.com/galaxyproject/galaxy/pull/18284>`_
+* Do not copy purged outputs to object store by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18342 <https://github.com/galaxyproject/galaxy/pull/18342>`_
+* Fix user's private role can be missing by `@davelopez <https://github.com/davelopez>`_ in `#18381 <https://github.com/galaxyproject/galaxy/pull/18381>`_
+* Assign default ``data`` extension on discovered collection output  by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18389 <https://github.com/galaxyproject/galaxy/pull/18389>`_
+
+=============
+Other changes
+=============
+
+* Replace busybox:ubuntu-14.04 image with busybox:1.36.1-glibc by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18428 <https://github.com/galaxyproject/galaxy/pull/18428>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
index cd53e425aa10..c48c3d1825bc 100644
--- a/packages/data/setup.cfg
+++ b/packages/data/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-data
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
@@ -45,7 +45,7 @@ install_requires =
     galaxy-sequence-utils
     h5grove>=1.2.1
     h5py
-    isa-rwval>=0.10.10
+    isa-rwval @ git+https://github.com/nsoranzo/isa-rwval.git@master
     isal
     MarkupSafe
     msal
@@ -53,7 +53,7 @@ install_requires =
     numpy
     parsley
     pycryptodome
-    pydantic[email]>=2,!=2.6.0,!=2.6.1
+    pydantic[email]>=2.7.4
     pylibmagic
     python-magic
     pysam>=0.21
diff --git a/packages/files/HISTORY.rst b/packages/files/HISTORY.rst
index 2fc21b40fea9..356f458d7c5a 100644
--- a/packages/files/HISTORY.rst
+++ b/packages/files/HISTORY.rst
@@ -4,11 +4,66 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix file source search query with empty string value by `@davelopez <https://github.com/davelopez>`_ in `#18191 <https://github.com/galaxyproject/galaxy/pull/18191>`_
+* Small bug fixes for user data plugins by `@jmchilton <https://github.com/jmchilton>`_ in `#18246 <https://github.com/galaxyproject/galaxy/pull/18246>`_
+* Fix check for anonymous by `@jdavcs <https://github.com/jdavcs>`_ in `#18364 <https://github.com/galaxyproject/galaxy/pull/18364>`_
+
+============
+Enhancements
+============
+
+* Add onedata objectstore by `@bwalkowi <https://github.com/bwalkowi>`_ in `#17540 <https://github.com/galaxyproject/galaxy/pull/17540>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Add Zenodo integration by `@davelopez <https://github.com/davelopez>`_ in `#18022 <https://github.com/galaxyproject/galaxy/pull/18022>`_
+* More typing in galaxy.files. by `@jmchilton <https://github.com/jmchilton>`_ in `#18037 <https://github.com/galaxyproject/galaxy/pull/18037>`_
+* Refactor galaxy.files plugin loading + config handling. by `@jmchilton <https://github.com/jmchilton>`_ in `#18049 <https://github.com/galaxyproject/galaxy/pull/18049>`_
+* Add stronger type annotations in file sources + refactoring by `@davelopez <https://github.com/davelopez>`_ in `#18050 <https://github.com/galaxyproject/galaxy/pull/18050>`_
+* Add pagination support to Files Source plugins by `@davelopez <https://github.com/davelopez>`_ in `#18059 <https://github.com/galaxyproject/galaxy/pull/18059>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Overhaul Azure storage infrastructure. by `@jmchilton <https://github.com/jmchilton>`_ in `#18087 <https://github.com/galaxyproject/galaxy/pull/18087>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Display DOIs in Archived Histories by `@davelopez <https://github.com/davelopez>`_ in `#18134 <https://github.com/galaxyproject/galaxy/pull/18134>`_
+* Update s3fs dependency. by `@jmchilton <https://github.com/jmchilton>`_ in `#18135 <https://github.com/galaxyproject/galaxy/pull/18135>`_
+* Onedada object store and files source stability fixes by `@bwalkowi <https://github.com/bwalkowi>`_ in `#18372 <https://github.com/galaxyproject/galaxy/pull/18372>`_
+
+=============
+Other changes
+=============
+
+* Fix #18316 (anonymous file sources) by `@jmchilton <https://github.com/jmchilton>`_ in `#18352 <https://github.com/galaxyproject/galaxy/pull/18352>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix listing possibly untitled records in Invenio Plugin by `@davelopez <https://github.com/davelopez>`_ in `#18130 <https://github.com/galaxyproject/galaxy/pull/18130>`_
+* Raise ``RequestParameterInvalidException`` when url is invalid by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18155 <https://github.com/galaxyproject/galaxy/pull/18155>`_
+* Fix error message when accessing restricted Zenodo records by `@davelopez <https://github.com/davelopez>`_ in `#18169 <https://github.com/galaxyproject/galaxy/pull/18169>`_
+* Raise ``RequestParameterInvalidException`` if url can't be verified by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18230 <https://github.com/galaxyproject/galaxy/pull/18230>`_
+* Fix Invenio credentials handling by `@davelopez <https://github.com/davelopez>`_ in `#18255 <https://github.com/galaxyproject/galaxy/pull/18255>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/files/setup.cfg b/packages/files/setup.cfg
index dc0599c9b7c3..9bf5eec1d63f 100644
--- a/packages/files/setup.cfg
+++ b/packages/files/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-files
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/job_execution/HISTORY.rst b/packages/job_execution/HISTORY.rst
index 65d9d4244618..a94919c3e982 100644
--- a/packages/job_execution/HISTORY.rst
+++ b/packages/job_execution/HISTORY.rst
@@ -4,11 +4,47 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Add input extra files to `get_input_fnames` by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18462 <https://github.com/galaxyproject/galaxy/pull/18462>`_
+
+============
+Enhancements
+============
+
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Refactor galaxy.files plugin loading + config handling. by `@jmchilton <https://github.com/jmchilton>`_ in `#18049 <https://github.com/galaxyproject/galaxy/pull/18049>`_
+* Add stronger type annotations in file sources + refactoring by `@davelopez <https://github.com/davelopez>`_ in `#18050 <https://github.com/galaxyproject/galaxy/pull/18050>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Include traceback when logging email PJA exception by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18122 <https://github.com/galaxyproject/galaxy/pull/18122>`_
+* Don't commit in ``DeleteIntermediatesAction`` by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18131 <https://github.com/galaxyproject/galaxy/pull/18131>`_
+* Don't fail metadata if we only have an extra output files dir by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18179 <https://github.com/galaxyproject/galaxy/pull/18179>`_
+* Don't set dataset peek for errored jobs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18231 <https://github.com/galaxyproject/galaxy/pull/18231>`_
+* Do not copy purged outputs to object store by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18342 <https://github.com/galaxyproject/galaxy/pull/18342>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/job_execution/setup.cfg b/packages/job_execution/setup.cfg
index 05394dca8e27..5e0e0d02b9c5 100644
--- a/packages/job_execution/setup.cfg
+++ b/packages/job_execution/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-job-execution
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/job_metrics/HISTORY.rst b/packages/job_metrics/HISTORY.rst
index aa0c39f3599d..1501175574b6 100644
--- a/packages/job_metrics/HISTORY.rst
+++ b/packages/job_metrics/HISTORY.rst
@@ -4,11 +4,29 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Type annotation improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17601 <https://github.com/galaxyproject/galaxy/pull/17601>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/job_metrics/setup.cfg b/packages/job_metrics/setup.cfg
index 476eea3712ad..3d15b9a7686e 100644
--- a/packages/job_metrics/setup.cfg
+++ b/packages/job_metrics/setup.cfg
@@ -28,7 +28,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-job-metrics
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/meta/setup.cfg b/packages/meta/setup.cfg
index 260765e0f7d2..2cd672568d9b 100644
--- a/packages/meta/setup.cfg
+++ b/packages/meta/setup.cfg
@@ -29,7 +29,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/navigation/HISTORY.rst b/packages/navigation/HISTORY.rst
index 0db4ab93679c..945b382e4c50 100644
--- a/packages/navigation/HISTORY.rst
+++ b/packages/navigation/HISTORY.rst
@@ -4,11 +4,23 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+No recorded changes since last release
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/navigation/setup.cfg b/packages/navigation/setup.cfg
index a2635d9e49fe..b8007512bd9e 100644
--- a/packages/navigation/setup.cfg
+++ b/packages/navigation/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-navigation
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst
index 2f6dc31f61a7..2174755b4f24 100644
--- a/packages/objectstore/HISTORY.rst
+++ b/packages/objectstore/HISTORY.rst
@@ -4,11 +4,56 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix odd object store exception by `@jmchilton <https://github.com/jmchilton>`_ in `#17810 <https://github.com/galaxyproject/galaxy/pull/17810>`_
+* Fix AWS object store for us-east-2 by `@jmchilton <https://github.com/jmchilton>`_ in `#18100 <https://github.com/galaxyproject/galaxy/pull/18100>`_
+* Fairly critical fix for #18087  by `@jmchilton <https://github.com/jmchilton>`_ in `#18110 <https://github.com/galaxyproject/galaxy/pull/18110>`_
+
+============
+Enhancements
+============
+
+* Adding object store plugin for Rucio by `@SergeyYakubov <https://github.com/SergeyYakubov>`_ in `#17156 <https://github.com/galaxyproject/galaxy/pull/17156>`_
+* Add onedata objectstore by `@bwalkowi <https://github.com/bwalkowi>`_ in `#17540 <https://github.com/galaxyproject/galaxy/pull/17540>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Overhaul Azure storage infrastructure. by `@jmchilton <https://github.com/jmchilton>`_ in `#18087 <https://github.com/galaxyproject/galaxy/pull/18087>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* More unit testing for object store stuff. by `@jmchilton <https://github.com/jmchilton>`_ in `#18136 <https://github.com/galaxyproject/galaxy/pull/18136>`_
+* Harden User Object Store and File Source Creation by `@jmchilton <https://github.com/jmchilton>`_ in `#18172 <https://github.com/galaxyproject/galaxy/pull/18172>`_
+* De-duplication of onedata objectstore code. by `@jmchilton <https://github.com/jmchilton>`_ in `#18174 <https://github.com/galaxyproject/galaxy/pull/18174>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+* Onedada object store and files source stability fixes by `@bwalkowi <https://github.com/bwalkowi>`_ in `#18372 <https://github.com/galaxyproject/galaxy/pull/18372>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Include stack when reporting delete error by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18208 <https://github.com/galaxyproject/galaxy/pull/18208>`_
+* Only log error if deleting directory really failed by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18236 <https://github.com/galaxyproject/galaxy/pull/18236>`_
+* Do not copy purged outputs to object store by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18342 <https://github.com/galaxyproject/galaxy/pull/18342>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/objectstore/setup.cfg b/packages/objectstore/setup.cfg
index 6ba5fe551e67..4f2f0e7148d1 100644
--- a/packages/objectstore/setup.cfg
+++ b/packages/objectstore/setup.cfg
@@ -28,7 +28,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-objectstore
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/schema/HISTORY.rst b/packages/schema/HISTORY.rst
index 16def6b775a4..d746fe40ad45 100644
--- a/packages/schema/HISTORY.rst
+++ b/packages/schema/HISTORY.rst
@@ -4,11 +4,45 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Visualizing workflow runs with an invocation graph view by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#17413 <https://github.com/galaxyproject/galaxy/pull/17413>`_
+* Add `email` notifications channel by `@davelopez <https://github.com/davelopez>`_ in `#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add pagination support to Files Source plugins by `@davelopez <https://github.com/davelopez>`_ in `#18059 <https://github.com/galaxyproject/galaxy/pull/18059>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Display DOIs in Archived Histories by `@davelopez <https://github.com/davelopez>`_ in `#18134 <https://github.com/galaxyproject/galaxy/pull/18134>`_
+* Allow running and editing workflows for specific versions by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18378 <https://github.com/galaxyproject/galaxy/pull/18378>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* do not expand datasets that are known to be inaccessible by `@martenson <https://github.com/martenson>`_ in `#17818 <https://github.com/galaxyproject/galaxy/pull/17818>`_
+* Allow purge query param, deprecate purge body param by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18105 <https://github.com/galaxyproject/galaxy/pull/18105>`_
+* Fix deprecated `deprecated` argument by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18119 <https://github.com/galaxyproject/galaxy/pull/18119>`_
+* Fix users API serialization when listing users by `@davelopez <https://github.com/davelopez>`_ in `#18329 <https://github.com/galaxyproject/galaxy/pull/18329>`_
+* Fix update group API payload model by `@davelopez <https://github.com/davelopez>`_ in `#18374 <https://github.com/galaxyproject/galaxy/pull/18374>`_
+* Serialize purged flag for datasets in collections by `@davelopez <https://github.com/davelopez>`_ in `#18420 <https://github.com/galaxyproject/galaxy/pull/18420>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/schema/setup.cfg b/packages/schema/setup.cfg
index dce6efc479ef..d2c2e3b1291a 100644
--- a/packages/schema/setup.cfg
+++ b/packages/schema/setup.cfg
@@ -27,13 +27,13 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-schema
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
 install_requires =
     galaxy-util
-    pydantic[email]>=2,!=2.6.0,!=2.6.1
+    pydantic[email]>=2.7.4
 packages = find:
 python_requires = >=3.8
 
diff --git a/packages/selenium/HISTORY.rst b/packages/selenium/HISTORY.rst
index 5beab1aae25b..7e4d745b7eda 100644
--- a/packages/selenium/HISTORY.rst
+++ b/packages/selenium/HISTORY.rst
@@ -4,11 +4,38 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix (I think) a transiently failing selenium error. by `@jmchilton <https://github.com/jmchilton>`_ in `#18065 <https://github.com/galaxyproject/galaxy/pull/18065>`_
+
+============
+Enhancements
+============
+
+* Add admin activity to activity bar by `@guerler <https://github.com/guerler>`_ in `#17877 <https://github.com/galaxyproject/galaxy/pull/17877>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Consolidate Visualization container, avoid using default iframe by `@guerler <https://github.com/guerler>`_ in `#18016 <https://github.com/galaxyproject/galaxy/pull/18016>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/selenium/setup.cfg b/packages/selenium/setup.cfg
index 07fab81680d9..4ca5c5df1a84 100644
--- a/packages/selenium/setup.cfg
+++ b/packages/selenium/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-selenium
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/test_api/HISTORY.rst b/packages/test_api/HISTORY.rst
index 792c69a9334e..fd2142439fec 100644
--- a/packages/test_api/HISTORY.rst
+++ b/packages/test_api/HISTORY.rst
@@ -4,11 +4,49 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+* Fix subwofklow tags serialization type by `@arash77 <https://github.com/arash77>`_ in `#18456 <https://github.com/galaxyproject/galaxy/pull/18456>`_
+
+============
+Enhancements
+============
+
+* Remove deprecated BCO export endpoint by `@martenson <https://github.com/martenson>`_ in `#16645 <https://github.com/galaxyproject/galaxy/pull/16645>`_
+* Enable all-vs-all collection analysis patterns. by `@jmchilton <https://github.com/jmchilton>`_ in `#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Refactor galaxy.files plugin loading + config handling. by `@jmchilton <https://github.com/jmchilton>`_ in `#18049 <https://github.com/galaxyproject/galaxy/pull/18049>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Allow purge query param, deprecate purge body param by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18105 <https://github.com/galaxyproject/galaxy/pull/18105>`_
+* Prevent anonymous and inactive users from running workflows by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18192 <https://github.com/galaxyproject/galaxy/pull/18192>`_
+* Check dataset state when attempting to acces dataset contents by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18214 <https://github.com/galaxyproject/galaxy/pull/18214>`_
+* Fix update group API payload model by `@davelopez <https://github.com/davelopez>`_ in `#18374 <https://github.com/galaxyproject/galaxy/pull/18374>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/test_api/setup.cfg b/packages/test_api/setup.cfg
index a6754d91250f..a4e6ce5544c8 100644
--- a/packages/test_api/setup.cfg
+++ b/packages/test_api/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-test-api
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/test_base/HISTORY.rst b/packages/test_base/HISTORY.rst
index 29b159027296..02265af284d7 100644
--- a/packages/test_base/HISTORY.rst
+++ b/packages/test_base/HISTORY.rst
@@ -4,11 +4,46 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+* Fix subwofklow tags serialization type by `@arash77 <https://github.com/arash77>`_ in `#18456 <https://github.com/galaxyproject/galaxy/pull/18456>`_
+
+============
+Enhancements
+============
+
+* Remove deprecated BCO export endpoint by `@martenson <https://github.com/martenson>`_ in `#16645 <https://github.com/galaxyproject/galaxy/pull/16645>`_
+* Enable all-vs-all collection analysis patterns. by `@jmchilton <https://github.com/jmchilton>`_ in `#17366 <https://github.com/galaxyproject/galaxy/pull/17366>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Error reporting unit tests by `@jmchilton <https://github.com/jmchilton>`_ in `#17968 <https://github.com/galaxyproject/galaxy/pull/17968>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix submitted value in workflow run form if data is constrained by tag filter by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18193 <https://github.com/galaxyproject/galaxy/pull/18193>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/test_base/setup.cfg b/packages/test_base/setup.cfg
index f5e3b8b0c9da..2fb287bad14c 100644
--- a/packages/test_base/setup.cfg
+++ b/packages/test_base/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-test-base
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/test_driver/HISTORY.rst b/packages/test_driver/HISTORY.rst
index 35bc848859c4..e314c57caf9e 100644
--- a/packages/test_driver/HISTORY.rst
+++ b/packages/test_driver/HISTORY.rst
@@ -4,11 +4,37 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Adding object store plugin for Rucio by `@SergeyYakubov <https://github.com/SergeyYakubov>`_ in `#17156 <https://github.com/galaxyproject/galaxy/pull/17156>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Overhaul Azure storage infrastructure. by `@jmchilton <https://github.com/jmchilton>`_ in `#18087 <https://github.com/galaxyproject/galaxy/pull/18087>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Skip tests if toolshed, dx.doi not responding by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18250 <https://github.com/galaxyproject/galaxy/pull/18250>`_
+* Move tool shed specific driver function to tool_shed.test by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18296 <https://github.com/galaxyproject/galaxy/pull/18296>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/test_driver/setup.cfg b/packages/test_driver/setup.cfg
index 5c3292823c1b..370525adddd9 100644
--- a/packages/test_driver/setup.cfg
+++ b/packages/test_driver/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-test-driver
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/test_selenium/setup.cfg b/packages/test_selenium/setup.cfg
index 03134c45bb19..9d6410d5cd29 100644
--- a/packages/test_selenium/setup.cfg
+++ b/packages/test_selenium/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-test-selenium
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/tool_shed/HISTORY.rst b/packages/tool_shed/HISTORY.rst
index 4d37ec4ce31c..a238e7eb849c 100644
--- a/packages/tool_shed/HISTORY.rst
+++ b/packages/tool_shed/HISTORY.rst
@@ -4,11 +4,44 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+* Fix various packages' issues by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18301 <https://github.com/galaxyproject/galaxy/pull/18301>`_
+
+============
+Enhancements
+============
+
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Add ``hgweb_repo_prefix`` attribute to ``TestToolShedConfig`` by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18268 <https://github.com/galaxyproject/galaxy/pull/18268>`_
+* Fix tool_shed package unit tests by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18327 <https://github.com/galaxyproject/galaxy/pull/18327>`_
+* Fix one more tool shed unit test by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18328 <https://github.com/galaxyproject/galaxy/pull/18328>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/tool_shed/setup.cfg b/packages/tool_shed/setup.cfg
index 9ec024a7992c..2f167e97693a 100644
--- a/packages/tool_shed/setup.cfg
+++ b/packages/tool_shed/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-tool-shed
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
@@ -50,7 +50,7 @@ install_requires =
     MarkupSafe
     mercurial
     Paste
-    pydantic>=2,!=2.6.0,!=2.6.1
+    pydantic>=2.7.4
     Routes
     SQLAlchemy>=2.0,<2.1
     starlette
diff --git a/packages/tool_util/HISTORY.rst b/packages/tool_util/HISTORY.rst
index 1192cd5b732d..83c56edb8548 100644
--- a/packages/tool_util/HISTORY.rst
+++ b/packages/tool_util/HISTORY.rst
@@ -4,11 +4,63 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix bug in galaxy.xsd by `@kostrykin <https://github.com/kostrykin>`_ in `#17752 <https://github.com/galaxyproject/galaxy/pull/17752>`_
+* Fix bug in `assert_has_image_n_labels` by `@kostrykin <https://github.com/kostrykin>`_ in `#17754 <https://github.com/galaxyproject/galaxy/pull/17754>`_
+* Remove linter for unstripped text content for tool xml leaves by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#18252 <https://github.com/galaxyproject/galaxy/pull/18252>`_
+
+============
+Enhancements
+============
+
+* Add test and doc showing how dynamic selects are used by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#16885 <https://github.com/galaxyproject/galaxy/pull/16885>`_
+* Add content assertion XML tags for test output verification using images by `@kostrykin <https://github.com/kostrykin>`_ in `#17581 <https://github.com/galaxyproject/galaxy/pull/17581>`_
+* Set minimal metadata also for empty bed datasets by `@wm75 <https://github.com/wm75>`_ in `#17586 <https://github.com/galaxyproject/galaxy/pull/17586>`_
+* Automatically bind `galaxy_data_manager_data_path` in containers by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17596 <https://github.com/galaxyproject/galaxy/pull/17596>`_
+* Type annotation improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17601 <https://github.com/galaxyproject/galaxy/pull/17601>`_
+* Type annotation and CWL-related improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17630 <https://github.com/galaxyproject/galaxy/pull/17630>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* Tool linter: check for valid bio.tools entries by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17655 <https://github.com/galaxyproject/galaxy/pull/17655>`_
+* Tool linter: check for leaf nodes with unstripped text content by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17656 <https://github.com/galaxyproject/galaxy/pull/17656>`_
+* Issue #17631: Make it possible to use custom invfile.lua if needed by `@martin-g <https://github.com/martin-g>`_ in `#17693 <https://github.com/galaxyproject/galaxy/pull/17693>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Add support for floating point TIFF files in verification of image-based tool outputs by `@kostrykin <https://github.com/kostrykin>`_ in `#17797 <https://github.com/galaxyproject/galaxy/pull/17797>`_
+* Add tool linting for valid EDAM terms by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17839 <https://github.com/galaxyproject/galaxy/pull/17839>`_
+* Add `pin_labels` attribute for `image_diff` comparison method by `@kostrykin <https://github.com/kostrykin>`_ in `#17866 <https://github.com/galaxyproject/galaxy/pull/17866>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Document syntax for accessing nested parameters in `change_format` - `when` tags by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#18018 <https://github.com/galaxyproject/galaxy/pull/18018>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Allow purge query param, deprecate purge body param by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18105 <https://github.com/galaxyproject/galaxy/pull/18105>`_
+* Make sure that all Linter subclasses are imported for listing them by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#18339 <https://github.com/galaxyproject/galaxy/pull/18339>`_
+* Assign default ``data`` extension on discovered collection output  by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18389 <https://github.com/galaxyproject/galaxy/pull/18389>`_
+* Allow in_range validator for selects by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#18403 <https://github.com/galaxyproject/galaxy/pull/18403>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg
index 848a609a6b2c..7c8fd75feec1 100644
--- a/packages/tool_util/setup.cfg
+++ b/packages/tool_util/setup.cfg
@@ -28,7 +28,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-tool-util
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/tours/HISTORY.rst b/packages/tours/HISTORY.rst
index 98b94ca159cc..17a158839c29 100644
--- a/packages/tours/HISTORY.rst
+++ b/packages/tours/HISTORY.rst
@@ -4,11 +4,23 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+No recorded changes since last release
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/tours/setup.cfg b/packages/tours/setup.cfg
index 1e14d2215a75..00ae27c407ab 100644
--- a/packages/tours/setup.cfg
+++ b/packages/tours/setup.cfg
@@ -27,13 +27,13 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-tours
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
 install_requires =
     galaxy-navigation
-    pydantic>=2,!=2.6.0,!=2.6.1
+    pydantic>=2.7.4
     PyYAML
 packages = find:
 python_requires = >=3.8
diff --git a/packages/util/HISTORY.rst b/packages/util/HISTORY.rst
index f181c3c71bce..ee1512d490a3 100644
--- a/packages/util/HISTORY.rst
+++ b/packages/util/HISTORY.rst
@@ -4,11 +4,51 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix bug in image_util.py by `@kostrykin <https://github.com/kostrykin>`_ in `#17749 <https://github.com/galaxyproject/galaxy/pull/17749>`_
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+
+============
+Enhancements
+============
+
+* Better display of estimated line numbers and add number of columns for tabular by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17492 <https://github.com/galaxyproject/galaxy/pull/17492>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Error reporting unit tests by `@jmchilton <https://github.com/jmchilton>`_ in `#17968 <https://github.com/galaxyproject/galaxy/pull/17968>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Overhaul Azure storage infrastructure. by `@jmchilton <https://github.com/jmchilton>`_ in `#18087 <https://github.com/galaxyproject/galaxy/pull/18087>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Harden User Object Store and File Source Creation by `@jmchilton <https://github.com/jmchilton>`_ in `#18172 <https://github.com/galaxyproject/galaxy/pull/18172>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Use config_section to distinguish between galaxy and ts or other apps by `@jdavcs <https://github.com/jdavcs>`_ in `#18215 <https://github.com/galaxyproject/galaxy/pull/18215>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/util/setup.cfg b/packages/util/setup.cfg
index d0a614868fa5..064f331f621c 100644
--- a/packages/util/setup.cfg
+++ b/packages/util/setup.cfg
@@ -28,7 +28,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-util
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/packages/web_apps/HISTORY.rst b/packages/web_apps/HISTORY.rst
index 364d1133a1d6..470b054011de 100644
--- a/packages/web_apps/HISTORY.rst
+++ b/packages/web_apps/HISTORY.rst
@@ -4,11 +4,92 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix permissions for temporary upload file for API uploads by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#17850 <https://github.com/galaxyproject/galaxy/pull/17850>`_
+* Dynamic tool fixes by `@dcore94 <https://github.com/dcore94>`_ in `#18085 <https://github.com/galaxyproject/galaxy/pull/18085>`_
+* Revert some requests import changes by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18199 <https://github.com/galaxyproject/galaxy/pull/18199>`_
+* Small bug fixes for user data plugins by `@jmchilton <https://github.com/jmchilton>`_ in `#18246 <https://github.com/galaxyproject/galaxy/pull/18246>`_
+* Fix various packages' issues by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18301 <https://github.com/galaxyproject/galaxy/pull/18301>`_
+
+============
+Enhancements
+============
+
+* Remove deprecated BCO export endpoint by `@martenson <https://github.com/martenson>`_ in `#16645 <https://github.com/galaxyproject/galaxy/pull/16645>`_
+* Implement a page object accessibility dialog by `@jmchilton <https://github.com/jmchilton>`_ in `#17225 <https://github.com/galaxyproject/galaxy/pull/17225>`_
+* Enable storage management by object store by `@jmchilton <https://github.com/jmchilton>`_ in `#17500 <https://github.com/galaxyproject/galaxy/pull/17500>`_
+* Type annotation and CWL-related improvements by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17630 <https://github.com/galaxyproject/galaxy/pull/17630>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Add `email` notifications channel by `@davelopez <https://github.com/davelopez>`_ in `#17914 <https://github.com/galaxyproject/galaxy/pull/17914>`_
+* Model typing and SA2.0 follow-up by `@jdavcs <https://github.com/jdavcs>`_ in `#17958 <https://github.com/galaxyproject/galaxy/pull/17958>`_
+* Drop unused workflow controller methods by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17974 <https://github.com/galaxyproject/galaxy/pull/17974>`_
+* Enable ``warn_unused_ignores`` mypy option by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17991 <https://github.com/galaxyproject/galaxy/pull/17991>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Consolidate Visualization container, avoid using default iframe by `@guerler <https://github.com/guerler>`_ in `#18016 <https://github.com/galaxyproject/galaxy/pull/18016>`_
+* Add pagination support to Files Source plugins by `@davelopez <https://github.com/davelopez>`_ in `#18059 <https://github.com/galaxyproject/galaxy/pull/18059>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+* Enable flake8-implicit-str-concat ruff rules by `@nsoranzo <https://github.com/nsoranzo>`_ in `#18067 <https://github.com/galaxyproject/galaxy/pull/18067>`_
+* Change `InvocationsList` into a grid using `GridList` by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18088 <https://github.com/galaxyproject/galaxy/pull/18088>`_
+* Empower users to bring their own storage and file sources by `@jmchilton <https://github.com/jmchilton>`_ in `#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`_
+* Harden User Object Store and File Source Creation by `@jmchilton <https://github.com/jmchilton>`_ in `#18172 <https://github.com/galaxyproject/galaxy/pull/18172>`_
+* Drop restriction to switch to immutable histories by `@davelopez <https://github.com/davelopez>`_ in `#18234 <https://github.com/galaxyproject/galaxy/pull/18234>`_
+* More structured indexing for user data objects. by `@jmchilton <https://github.com/jmchilton>`_ in `#18291 <https://github.com/galaxyproject/galaxy/pull/18291>`_
+* Allow running and editing workflows for specific versions by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18378 <https://github.com/galaxyproject/galaxy/pull/18378>`_
+
+=============
+Other changes
+=============
+
+* Fix typing issue in reused variable by `@davelopez <https://github.com/davelopez>`_ in `#18344 <https://github.com/galaxyproject/galaxy/pull/18344>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* do not expand datasets that are known to be inaccessible by `@martenson <https://github.com/martenson>`_ in `#17818 <https://github.com/galaxyproject/galaxy/pull/17818>`_
+* Raise exception if collection elements missing during download by `@jdavcs <https://github.com/jdavcs>`_ in `#18094 <https://github.com/galaxyproject/galaxy/pull/18094>`_
+* Allow purge query param, deprecate purge body param by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18105 <https://github.com/galaxyproject/galaxy/pull/18105>`_
+* Prevent anonymous and inactive users from running workflows by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#18192 <https://github.com/galaxyproject/galaxy/pull/18192>`_
+* Fix `make all histories private` with immutable histories by `@davelopez <https://github.com/davelopez>`_ in `#18200 <https://github.com/galaxyproject/galaxy/pull/18200>`_
+* Fix pca 3d rendering of tabular files and visualization error handling in general by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18211 <https://github.com/galaxyproject/galaxy/pull/18211>`_
+* Check dataset state when attempting to acces dataset contents by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18214 <https://github.com/galaxyproject/galaxy/pull/18214>`_
+* Restrict job_files access to jobs that are not terminal by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18217 <https://github.com/galaxyproject/galaxy/pull/18217>`_
+* Raise appropriate exception if accessing deleted input file by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18223 <https://github.com/galaxyproject/galaxy/pull/18223>`_
+* Fix element serialization for collections that aren't populated yet by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18235 <https://github.com/galaxyproject/galaxy/pull/18235>`_
+* Skip new history creation if user is anonymous and login is required by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18319 <https://github.com/galaxyproject/galaxy/pull/18319>`_
+* Fix users API serialization when listing users by `@davelopez <https://github.com/davelopez>`_ in `#18329 <https://github.com/galaxyproject/galaxy/pull/18329>`_
+* Fix authentication error for anonymous users querying jobs by `@davelopez <https://github.com/davelopez>`_ in `#18333 <https://github.com/galaxyproject/galaxy/pull/18333>`_
+* Do not copy purged outputs to object store by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18342 <https://github.com/galaxyproject/galaxy/pull/18342>`_
+* Fix anonymous user job retrieval logic by `@davelopez <https://github.com/davelopez>`_ in `#18358 <https://github.com/galaxyproject/galaxy/pull/18358>`_
+* Fix update group API payload model by `@davelopez <https://github.com/davelopez>`_ in `#18374 <https://github.com/galaxyproject/galaxy/pull/18374>`_
+* Drop unnecessary escaping for workflow name and annotation by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18376 <https://github.com/galaxyproject/galaxy/pull/18376>`_
+
+=============
+Other changes
+=============
+
+* Decrease log level for expected visualization errors by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18229 <https://github.com/galaxyproject/galaxy/pull/18229>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/web_apps/setup.cfg b/packages/web_apps/setup.cfg
index 02b2a8005312..c33e2002f9a1 100644
--- a/packages/web_apps/setup.cfg
+++ b/packages/web_apps/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-web-apps
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
@@ -50,7 +50,7 @@ install_requires =
     Mako
     MarkupSafe
     Paste
-    pydantic>=2,!=2.6.0,!=2.6.1
+    pydantic>=2.7.4
     PyJWT
     python-dateutil
     python-multipart  # required to support form parsing in FastAPI/Starlette
diff --git a/packages/web_framework/HISTORY.rst b/packages/web_framework/HISTORY.rst
index f3bb5f762efd..6ef26301eff3 100644
--- a/packages/web_framework/HISTORY.rst
+++ b/packages/web_framework/HISTORY.rst
@@ -4,11 +4,38 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+* Code cleanups from ruff and pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#17654 <https://github.com/galaxyproject/galaxy/pull/17654>`_
+* SQLAlchemy 2.0 by `@jdavcs <https://github.com/jdavcs>`_ in `#17778 <https://github.com/galaxyproject/galaxy/pull/17778>`_
+* Add galaxy to user agent by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18003 <https://github.com/galaxyproject/galaxy/pull/18003>`_
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#18063 <https://github.com/galaxyproject/galaxy/pull/18063>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Reset content-length for unhandled exceptions by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18233 <https://github.com/galaxyproject/galaxy/pull/18233>`_
+* More fixes for running the TS with external hgweb by `@mvdbeek <https://github.com/mvdbeek>`_ in `#18279 <https://github.com/galaxyproject/galaxy/pull/18279>`_
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/web_framework/setup.cfg b/packages/web_framework/setup.cfg
index 55d3421dade9..d9c47cd7e37d 100644
--- a/packages/web_framework/setup.cfg
+++ b/packages/web_framework/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-web-framework
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
@@ -37,7 +37,7 @@ install_requires =
     babel
     MarkupSafe
     paste
-    pydantic>=2,!=2.6.0,!=2.6.1
+    pydantic>=2.7.4
     requests
     Routes
     SQLAlchemy>=2.0,<2.1
diff --git a/packages/web_stack/HISTORY.rst b/packages/web_stack/HISTORY.rst
index bcb6837658c6..8271f6fa0196 100644
--- a/packages/web_stack/HISTORY.rst
+++ b/packages/web_stack/HISTORY.rst
@@ -4,11 +4,28 @@ History
 .. to_doc
 
 ---------
-24.1.dev0
+24.2.dev0
 ---------
 
 
 
+-------------------
+24.1.1 (2024-07-02)
+-------------------
+
+
+============
+Enhancements
+============
+
+* Update Python dependencies by `@galaxybot <https://github.com/galaxybot>`_ in `#17653 <https://github.com/galaxyproject/galaxy/pull/17653>`_
+
+-------------------
+24.0.3 (2024-06-28)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 24.0.2 (2024-05-07)
 -------------------
diff --git a/packages/web_stack/setup.cfg b/packages/web_stack/setup.cfg
index 16e6d08f1c15..e3d80a798b06 100644
--- a/packages/web_stack/setup.cfg
+++ b/packages/web_stack/setup.cfg
@@ -27,7 +27,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-web-stack
 url = https://github.com/galaxyproject/galaxy
-version = 23.2.dev0
+version = 24.2.dev0
 
 [options]
 include_package_data = True
diff --git a/pyproject.toml b/pyproject.toml
index 92f64e3672d8..56147a86ef77 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -70,7 +70,7 @@ gxformat2 = "*"
 h5grove = ">=1.2.1"
 h5py = "*"
 importlib-resources = { version = "*", python = "<3.9" }  # for importlib.{abc.Traversable,resources.{files, Package}}
-isa-rwval = ">=0.10.10"
+isa-rwval = { git = "https://github.com/nsoranzo/isa-rwval.git", branch = "master" }  # https://github.com/ISA-tools/isa-rwval/pull/17
 jinja2 = "*"
 kombu = ">=5.3"  # for importlib-metadata fix
 isal = "*"
@@ -92,7 +92,7 @@ pillow = "*"
 psutil = "*"
 pulsar-galaxy-lib = ">=0.15.0.dev0"
 pycryptodome = "*"
-pydantic = {version = ">=2.7.0", extras = ["email"]}  # https://github.com/pydantic/pydantic/issues/8760
+pydantic = {version = ">=2.7.4", extras = ["email"]}  # https://github.com/pydantic/pydantic/pull/9639
 PyJWT = "*"
 pykwalify = "*"
 pylibmagic = "*"
@@ -175,7 +175,7 @@ Werkzeug = "*"
 mypy = "*"
 boto3-stubs = {version = "*", extras = ["s3"]}
 lxml-stubs = "*"
-pydantic = ">=2, !=2.6.0, !=2.6.1"  # for pydantic.mypy plugin
+pydantic = ">=2.7.4"  # for pydantic.mypy plugin
 types-bleach = "*"
 types-boto = "*"
 types-contextvars = "*"
@@ -199,7 +199,7 @@ exclude = [
 # Enable: pycodestyle errors (E), Pyflakes (F), flake8-bugbear (B),
 # flake8-comprehensions (C4), flake8-logging-format (G),
 # flake8-implicit-str-concat (ISC) and pyupgrade (UP)
-select = ["E", "F", "B", "C4", "G", "ISC", "UP"]
+select = ["E", "F", "B", "C4", "G", "ISC", "NPY", "UP"]
 # Exceptions:
 # B008 Do not perform function calls in argument defaults (for FastAPI Depends and Body)
 # B9 flake8-bugbear opinionated warnings
diff --git a/templates/galaxy_client_app.mako b/templates/galaxy_client_app.mako
index 504b3300e2b1..caec938bbe89 100644
--- a/templates/galaxy_client_app.mako
+++ b/templates/galaxy_client_app.mako
@@ -73,7 +73,7 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
 
 <%def name="config_plausible_analytics(plausible_server, plausible_domain)">
     %if plausible_server and plausible_domain:
-        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
+        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/script.js"></script>
         <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
     %else:
         <script>
diff --git a/templates/js-app.mako b/templates/js-app.mako
index 5b24b01cf47d..66e0935bf631 100644
--- a/templates/js-app.mako
+++ b/templates/js-app.mako
@@ -22,10 +22,10 @@
             | ${app.config.brand}
             %endif
         </title>
-        
+
         ## relative href for site root
         <link rel="index" href="${ h.url_for( '/' ) }"/>
-        
+
         ## TODO: use loaders to move everything but the essentials below the fold
         ${ h.dist_css(
             'base',
@@ -86,10 +86,10 @@
         ${ galaxy_client.config_google_analytics(app.config.ga_code) }
     %endif
     %if app.config.plausible_server and app.config.plausible_domain:
-            ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
+        ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
     %endif
     %if app.config.matomo_server and app.config.matomo_site_id:
-            ${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
+        ${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
     %endif
 </%def>
 
diff --git a/test/functional/tools/catDocker.xml b/test/functional/tools/catDocker.xml
index 5cef7257ca16..5abfe4fbfb29 100644
--- a/test/functional/tools/catDocker.xml
+++ b/test/functional/tools/catDocker.xml
@@ -1,7 +1,7 @@
 <tool id="catdc" name="Concatenate datasets (in docker)" version="1.0.0">
     <description>tail-to-head</description>
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command><![CDATA[
 echo "Galaxy slots passed through contain as \$GALAXY_SLOTS" &&
diff --git a/test/functional/tools/discover_default_ext.xml b/test/functional/tools/discover_default_ext.xml
new file mode 100644
index 000000000000..7f7c7d83cdd8
--- /dev/null
+++ b/test/functional/tools/discover_default_ext.xml
@@ -0,0 +1,52 @@
+<tool id="discover_default_ext" name="discover_default_ext" version="0.1.0">
+    <command><![CDATA[
+echo 1 > 1.txt;
+]]></command>
+    <inputs />
+    <outputs>
+        <collection name="collection_with_default_ext" type="list" label="with default format" format="fasta">
+            <discover_datasets pattern="__name_and_ext__" />
+        </collection>
+        <collection name="collection_default_ext_and_explicit_format" type="list" label="with default format and static element format" format="fasta">
+            <discover_datasets pattern="__name__" format="txt" />
+        </collection>
+        <collection name="collection_default_ext_used" type="list" label="with default format and no override" format="fasta">
+            <discover_datasets pattern="__name__" />
+        </collection>
+        <collection name="collection_without_default_ext" type="list" label="wihtout default ext, should be data">
+            <discover_datasets pattern="__name__" />
+        </collection>
+    </outputs>
+    <tests>
+        <test expect_num_outputs="4">
+            <output_collection name="collection_with_default_ext" type="list" count="1">
+                <element name="1" ftype="txt">
+                    <assert_contents>
+                        <has_text text="1" />
+                    </assert_contents>
+                </element>
+            </output_collection>
+            <output_collection name="collection_default_ext_and_explicit_format" type="list" count="1">
+                <element name="1.txt" ftype="txt">
+                    <assert_contents>
+                        <has_text text="1" />
+                    </assert_contents>
+                </element>
+            </output_collection>
+            <output_collection name="collection_default_ext_used" type="list" count="1">
+                <element name="1.txt" ftype="fasta">
+                    <assert_contents>
+                        <has_text text="1" />
+                    </assert_contents>
+                </element>
+            </output_collection>
+            <output_collection name="collection_without_default_ext" type="list" count="1">
+                <element name="1.txt" ftype="data">
+                    <assert_contents>
+                        <has_text text="1" />
+                    </assert_contents>
+                </element>
+            </output_collection>
+        </test>
+    </tests>
+</tool>
diff --git a/test/functional/tools/job_environment_default.xml b/test/functional/tools/job_environment_default.xml
index c51108cb4f3a..f901e9c273ae 100644
--- a/test/functional/tools/job_environment_default.xml
+++ b/test/functional/tools/job_environment_default.xml
@@ -1,6 +1,6 @@
 <tool id="job_environment_default" name="job_environment_default" version="0.1.0" profile="18.01">
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 mktemp -d &&
diff --git a/test/functional/tools/job_environment_default_legacy.xml b/test/functional/tools/job_environment_default_legacy.xml
index 3d3e49de6e75..2e2782d52944 100644
--- a/test/functional/tools/job_environment_default_legacy.xml
+++ b/test/functional/tools/job_environment_default_legacy.xml
@@ -1,6 +1,6 @@
 <tool id="job_environment_default_legacy" name="job_environment_default_legacy" version="0.1.0">
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 mktemp -d &&
diff --git a/test/functional/tools/job_environment_explicit_isolated_home.xml b/test/functional/tools/job_environment_explicit_isolated_home.xml
index b665f87384d7..906a8cfdd62b 100644
--- a/test/functional/tools/job_environment_explicit_isolated_home.xml
+++ b/test/functional/tools/job_environment_explicit_isolated_home.xml
@@ -1,6 +1,6 @@
 <tool id="job_environment_explicit_isolated_home" name="job_environment_explicit_isolated_home" version="0.1.0">
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command use_shared_home="false"><![CDATA[
 mktemp -d &&
diff --git a/test/functional/tools/job_environment_explicit_shared_home.xml b/test/functional/tools/job_environment_explicit_shared_home.xml
index 8e23c3924b41..9b24267df664 100644
--- a/test/functional/tools/job_environment_explicit_shared_home.xml
+++ b/test/functional/tools/job_environment_explicit_shared_home.xml
@@ -1,6 +1,6 @@
 <tool id="job_environment_explicit_shared_home" name="job_environment_explicit_shared_home" version="0.1.0" profile="18.01">
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command use_shared_home="true"><![CDATA[
 mktemp -d &&
diff --git a/test/functional/tools/sample_tool_conf.xml b/test/functional/tools/sample_tool_conf.xml
index b58a2ab1f64f..45eee3cc16c9 100644
--- a/test/functional/tools/sample_tool_conf.xml
+++ b/test/functional/tools/sample_tool_conf.xml
@@ -208,6 +208,7 @@
   <tool file="collection_cat_group_tag.xml" />
   <tool file="collection_cat_group_tag_multiple.xml" />
   <tool file="discover_sort_by.xml" />
+  <tool file="discover_default_ext.xml" />
   <tool file="expression_forty_two.xml" />
   <tool file="expression_pick_larger_file.xml" />
   <tool file="expression_parse_int.xml" />
diff --git a/test/functional/tools/tool_directory_docker.xml b/test/functional/tools/tool_directory_docker.xml
index fa408789f340..dc24490279ce 100644
--- a/test/functional/tools/tool_directory_docker.xml
+++ b/test/functional/tools/tool_directory_docker.xml
@@ -1,6 +1,6 @@
 <tool id="tool_directory_docker" name="tool_directory_docker" version="1.0.0">
     <requirements>
-        <container type="docker">busybox:ubuntu-14.04</container>
+        <container type="docker">busybox:1.36.1-glibc</container>
     </requirements>
     <command><![CDATA[
 cp '$__tool_directory__/tool_directory.xml' output1
diff --git a/test/integration/test_coexecution.py b/test/integration/test_coexecution.py
index 3bfb97561d44..7e7543443dc7 100644
--- a/test/integration/test_coexecution.py
+++ b/test/integration/test_coexecution.py
@@ -66,7 +66,7 @@
       k8s_namespace: ${k8s_namespace}
       runner: pulsar_k8s
       docker_enabled: true
-      docker_default_container_id: busybox:ubuntu-14.04
+      docker_default_container_id: busybox:1.36.1-glibc
       pulsar_app_config:
         message_queue_url: '${container_amqp_url}'
       env:
@@ -145,7 +145,7 @@ def job_config(template_str: str, jobs_directory: str) -> str:
       runner: pulsar_tes
       tes_url: ${tes_url}
       docker_enabled: true
-      docker_default_container_id: busybox:ubuntu-14.04
+      docker_default_container_id: busybox:1.36.1-glibc
       pulsar_app_config:
         message_queue_url: '${container_amqp_url}'
       env:
@@ -204,7 +204,7 @@ def job_config(template_str: str, jobs_directory: str) -> str:
       runner: pulsar_tes
       tes_url: ${tes_url}
       docker_enabled: true
-      docker_default_container_id: busybox:ubuntu-14.04
+      docker_default_container_id: busybox:1.36.1-glibc
       pulsar_app_config:
         message_queue_url: '${container_amqp_url}'
       env:
diff --git a/test/integration/test_kubernetes_runner.py b/test/integration/test_kubernetes_runner.py
index c751734353e2..9748d4b497b5 100644
--- a/test/integration/test_kubernetes_runner.py
+++ b/test/integration/test_kubernetes_runner.py
@@ -133,21 +133,21 @@ def job_config(jobs_directory: str) -> Config:
             <param id="limits_cpu">1.1</param>
             <param id="limits_memory">100M</param>
             <param id="docker_enabled">true</param>
-            <param id="docker_default_container_id">busybox:ubuntu-14.04</param>
+            <param id="docker_default_container_id">busybox:1.36.1-glibc</param>
             <env id="SOME_ENV_VAR">42</env>
         </destination>
         <destination id="k8s_destination_walltime_short" runner="k8s_walltime_short">
             <param id="limits_cpu">1.1</param>
             <param id="limits_memory">100M</param>
             <param id="docker_enabled">true</param>
-            <param id="docker_default_container_id">busybox:ubuntu-14.04</param>
+            <param id="docker_default_container_id">busybox:1.36.1-glibc</param>
             <env id="SOME_ENV_VAR">42</env>
         </destination>
         <destination id="k8s_destination_no_cleanup" runner="k8s_no_cleanup">
             <param id="limits_cpu">1.1</param>
             <param id="limits_memory">100M</param>
             <param id="docker_enabled">true</param>
-            <param id="docker_default_container_id">busybox:ubuntu-14.04</param>
+            <param id="docker_default_container_id">busybox:1.36.1-glibc</param>
             <env id="SOME_ENV_VAR">42</env>
         </destination>
         <destination id="local_dest" runner="local">
diff --git a/test/integration/test_workflow_refactoring.py b/test/integration/test_workflow_refactoring.py
index 6a03d818ce31..d68b8916145b 100644
--- a/test/integration/test_workflow_refactoring.py
+++ b/test/integration/test_workflow_refactoring.py
@@ -537,6 +537,35 @@ def test_tool_version_upgrade_no_state_change(self):
         assert len(action_executions[0].messages) == 0
         assert self._latest_workflow.step_by_label("the_step").tool_version == "0.2"
 
+    def test_tool_version_upgrade_keeps_when_expression(self):
+        self.workflow_populator.upload_yaml_workflow(
+            """
+class: GalaxyWorkflow
+inputs:
+  the_bool:
+    type: boolean
+steps:
+  the_step:
+    tool_id: multiple_versions
+    tool_version: '0.1'
+    in:
+      when: the_bool
+    state:
+      inttest: 0
+    when: $(inputs.when)
+"""
+        )
+        assert self._latest_workflow.step_by_label("the_step").tool_version == "0.1"
+        actions: ActionsJson = [
+            {"action_type": "upgrade_tool", "step": {"label": "the_step"}},
+        ]
+        action_executions = self._refactor(actions).action_executions
+        assert len(action_executions) == 1
+        assert len(action_executions[0].messages) == 0
+        step = self._latest_workflow.step_by_label("the_step")
+        assert step.tool_version == "0.2"
+        assert step.when_expression
+
     def test_tool_version_upgrade_state_added(self):
         self.workflow_populator.upload_yaml_workflow(
             """
diff --git a/test/integration_selenium/test_objectstore_selection.py b/test/integration_selenium/test_objectstore_selection.py
index 85be2f937430..aa7f28b0118d 100644
--- a/test/integration_selenium/test_objectstore_selection.py
+++ b/test/integration_selenium/test_objectstore_selection.py
@@ -136,7 +136,6 @@ def test_3_user_un_override(self):
         preferences = self.components.preferences
         preferences.preferred_storage.wait_for_and_click()
         self.select_storage("__null__")
-
         self.run_environment_test_tool()
         self.wait_for_hid_ok_and_open_details(1)
         details = self.components.object_store_details
diff --git a/test/integration_selenium/test_user_file_source_aws_public.py b/test/integration_selenium/test_user_file_source_aws_public.py
index 668d022b97f0..5ec2ba12d64d 100644
--- a/test/integration_selenium/test_user_file_source_aws_public.py
+++ b/test/integration_selenium/test_user_file_source_aws_public.py
@@ -15,7 +15,6 @@ class TestUserFileSourceAwsPublicSeleniumIntegration(BaseUserObjectStoreSelenium
     @managed_history
     @selenium_test
     def test_create_and_use(self):
-        self.navigate_to_user_preferences()
         random_name = self._get_random_name(prefix="Encyclopedia of DNA Elements ENCODE")
         instance = FileSourceInstance(
             template_id="aws_public",
diff --git a/test/unit/app/jobs/test_job_configuration.py b/test/unit/app/jobs/test_job_configuration.py
index dc8e19c8a07e..29a22480830c 100644
--- a/test/unit/app/jobs/test_job_configuration.py
+++ b/test/unit/app/jobs/test_job_configuration.py
@@ -332,7 +332,7 @@ def test_container_tag_in_destination(self):
         assert len(container) == 2
         container0 = container[0]
         assert container0["type"] == "docker"
-        assert container0["identifier"] == "busybox:ubuntu-14.04"
+        assert container0["identifier"] == "busybox:1.36.1-glibc"
 
         container_override = container_dest.params["container_override"]
         assert len(container_override) == 2
diff --git a/test/unit/app/managers/test_UserManager.py b/test/unit/app/managers/test_UserManager.py
index 871daac25c8f..b8286838d103 100644
--- a/test/unit/app/managers/test_UserManager.py
+++ b/test/unit/app/managers/test_UserManager.py
@@ -232,6 +232,16 @@ def validate_send_email(frm, to, subject, body, config, html=None):
                 mock_unique_id.assert_called_once()
         assert result is None
 
+    def test_reset_email_user_deleted(self):
+        self.trans.app.config.allow_user_deletion = True
+        self.log("should not produce the password reset email if user is deleted")
+        user_email = "user@nopassword.com"
+        user = self.user_manager.create(email=user_email, username="nopassword")
+        self.user_manager.delete(user)
+        assert user.deleted is True
+        message = self.user_manager.send_reset_email(self.trans, {"email": user_email})
+        assert message == "Failed to produce password reset token. User not found."
+
     def test_get_user_by_identity(self):
         # return None if username/email not found
         assert self.user_manager.get_user_by_identity("xyz") is None
diff --git a/test/unit/app/tools/test_collect_primary_datasets.py b/test/unit/app/tools/test_collect_primary_datasets.py
index 16f3c6aae13e..fb612853b4db 100644
--- a/test/unit/app/tools/test_collect_primary_datasets.py
+++ b/test/unit/app/tools/test_collect_primary_datasets.py
@@ -128,6 +128,20 @@ def test_collect_multiple_recurse_dict(self):
         created_hda_3 = datasets[DEFAULT_TOOL_OUTPUT]["test3"]
         assert_created_with_path(self.app.object_store, created_hda_3.dataset, path3)
 
+    def test_collect_collection_default_format(self):
+        self._replace_output_collectors(
+            """<dataset_collection name="parent" format="abcdef">
+            <discover_datasets pattern="__name__" directory="subdir_for_name_discovery" sort_by="reverse_filename" />
+        </dataset_collection>"""
+        )
+        self._setup_extra_file(subdir="subdir_for_name_discovery", filename="test1")
+        self._setup_extra_file(subdir="subdir_for_name_discovery", filename="test2")
+
+        datasets = self._collect()
+        assert DEFAULT_TOOL_OUTPUT in datasets
+        for dataset in datasets[DEFAULT_TOOL_OUTPUT].values():
+            assert dataset.ext == "abcdef"
+
     def test_collect_sorted_reverse(self):
         self._replace_output_collectors(
             """<output>
diff --git a/test/unit/app/tools/test_parameter_validation.py b/test/unit/app/tools/test_parameter_validation.py
index b3d240a96161..a7798927eb65 100644
--- a/test/unit/app/tools/test_parameter_validation.py
+++ b/test/unit/app/tools/test_parameter_validation.py
@@ -219,11 +219,13 @@ def test_InRangeValidator(self):
         )
         p.validate(10)
         with self.assertRaisesRegex(
-            ValueError, r"Parameter blah: Value \('15'\) must not fulfill float\('10'\) < value <= float\('20'\)"
+            ValueError,
+            r"Parameter blah: Value \('15'\) must not fulfill float\('10'\) < float\(value\) <= float\('20'\)",
         ):
             p.validate(15)
         with self.assertRaisesRegex(
-            ValueError, r"Parameter blah: Value \('20'\) must not fulfill float\('10'\) < value <= float\('20'\)"
+            ValueError,
+            r"Parameter blah: Value \('20'\) must not fulfill float\('10'\) < float\(value\) <= float\('20'\)",
         ):
             p.validate(20)
         p.validate(21)
diff --git a/test/unit/data/model/test_model_store.py b/test/unit/data/model/test_model_store.py
index a30410dd0207..80dd3789ef1b 100644
--- a/test/unit/data/model/test_model_store.py
+++ b/test/unit/data/model/test_model_store.py
@@ -1215,7 +1215,6 @@ def import_archive(archive_path, app, user, import_options=None):
     dest_dir = CompressedFile(archive_path).extract(dest_parent)
 
     import_options = import_options or store.ImportOptions()
-    new_history = None
     model_store = store.get_import_model_store_for_directory(
         dest_dir,
         app=app,
diff --git a/test/unit/tool_util/verify/test_asserts.py b/test/unit/tool_util/verify/test_asserts.py
index a7f419fa4a32..af357871ccad 100644
--- a/test/unit/tool_util/verify/test_asserts.py
+++ b/test/unit/tool_util/verify/test_asserts.py
@@ -1315,7 +1315,7 @@ def test_has_h5_attribute_failure():
         """test has_attribute .. negative"""
         a = run_assertions(H5_HAS_ATTRIBUTE_NEGATIVE, H5BYTES)
         assert (
-            "Not a HDF5 file or H5 attributes do not match:\n\t[('myfileattr', 'myfileattrvalue'), ('myfileattrint', 1)]\n\n\t(myfileattr : wrong)"
+            "Not a HDF5 file or H5 attributes do not match:\n\t[('myfileattr', 'myfileattrvalue'), ('myfileattrint', '1')]\n\n\t(myfileattr : wrong)"
             in a
         )
         assert len(a) == 1