diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 8865c361e282..cb7b0dc21217 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -6656,19 +6656,38 @@ export interface components {
          * This model is based on the Discourse API response for the search endpoint.
          */
         HelpForumSearchResponse: {
-            /** Categories */
-            categories: components["schemas"]["HelpForumCategory"][] | null;
-            grouped_search_result: components["schemas"]["HelpForumGroupedSearchResult"] | null;
-            /** Groups */
-            groups: components["schemas"]["HelpForumGroup"][] | null;
-            /** Posts */
-            posts: components["schemas"]["HelpForumPost"][] | null;
-            /** Tags */
-            tags: components["schemas"]["HelpForumTag"][] | null;
-            /** Topics */
-            topics: components["schemas"]["HelpForumTopic"][] | null;
-            /** Users */
-            users: components["schemas"]["HelpForumUser"][] | null;
+            /**
+             * Categories
+             * @description The list of categories returned by the search.
+             */
+            categories?: components["schemas"]["HelpForumCategory"][] | null;
+            /** @description The grouped search result. */
+            grouped_search_result?: components["schemas"]["HelpForumGroupedSearchResult"] | null;
+            /**
+             * Groups
+             * @description The list of groups returned by the search.
+             */
+            groups?: components["schemas"]["HelpForumGroup"][] | null;
+            /**
+             * Posts
+             * @description The list of posts returned by the search.
+             */
+            posts?: components["schemas"]["HelpForumPost"][];
+            /**
+             * Tags
+             * @description The list of tags returned by the search.
+             */
+            tags?: components["schemas"]["HelpForumTag"][] | null;
+            /**
+             * Topics
+             * @description The list of topics returned by the search.
+             */
+            topics?: components["schemas"]["HelpForumTopic"][];
+            /**
+             * Users
+             * @description The list of users returned by the search.
+             */
+            users?: components["schemas"]["HelpForumUser"][] | null;
         };
         /**
          * HelpForumTag
@@ -6696,7 +6715,7 @@ export interface components {
              * Bookmarked
              * @description Whether the topic is bookmarked.
              */
-            bookmarked: boolean | null;
+            bookmarked?: boolean | null;
             /**
              * Bumped
              * @description Whether the topic was bumped.
@@ -6751,7 +6770,7 @@ export interface components {
              * Liked
              * @description Whether the topic is liked.
              */
-            liked: boolean | null;
+            liked?: boolean | null;
             /**
              * Pinned
              * @description Whether the topic is pinned.
@@ -6781,7 +6800,7 @@ export interface components {
              * Tags Descriptions
              * @description The descriptions of the tags of the topic.
              */
-            tags_descriptions: Record<string, never> | null;
+            tags_descriptions?: Record<string, never> | null;
             /**
              * Title
              * @description The title of the topic.
@@ -6791,7 +6810,7 @@ export interface components {
              * Unpinned
              * @description Whether the topic is unpinned.
              */
-            unpinned: boolean | null;
+            unpinned?: boolean | null;
             /**
              * Unseen
              * @description Whether the topic is unseen.
diff --git a/client/src/components/History/Content/Dataset/DatasetDetails.vue b/client/src/components/History/Content/Dataset/DatasetDetails.vue
index 23c1138714f5..5cf6b2880e1d 100644
--- a/client/src/components/History/Content/Dataset/DatasetDetails.vue
+++ b/client/src/components/History/Content/Dataset/DatasetDetails.vue
@@ -8,6 +8,7 @@ import { useDatasetStore } from "@/stores/datasetStore";
 import { type ItemUrls } from ".";
 
 import DatasetActions from "./DatasetActions.vue";
+import DatasetMiscInfo from "./DatasetMiscInfo.vue";
 
 const datasetStore = useDatasetStore();
 
@@ -56,9 +57,7 @@ function toggleHighlights() {
                             result.genome_build
                         }}</BLink>
                     </span>
-                    <div v-if="result.misc_info" class="info">
-                        <span class="value">{{ result.misc_info }}</span>
-                    </div>
+                    <DatasetMiscInfo v-if="result.misc_info" :misc-info="result.misc_info" />
                 </div>
                 <DatasetActions
                     :item="result"
diff --git a/client/src/components/History/Content/Dataset/DatasetMiscInfo.vue b/client/src/components/History/Content/Dataset/DatasetMiscInfo.vue
new file mode 100644
index 000000000000..48da43472494
--- /dev/null
+++ b/client/src/components/History/Content/Dataset/DatasetMiscInfo.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { computed, ref, watch } from "vue";
+
+interface Props {
+    miscInfo: string;
+}
+
+const showErrorHelp = ref(false);
+const sharingError = ref(false);
+
+// old sharable error: Attempted to create shared output datasets in objectstore with sharing disabled
+// new sharable error: Job attempted to create sharable output datasets in a storage location with sharing disabled
+const sharingErrorRex: RegExp = /with sharing disabled/g;
+const knownErrors = [{ regex: sharingErrorRex, modalRef: sharingError }];
+
+const props = defineProps<Props>();
+
+const fixable = computed(() => {
+    return knownErrors.some((error) => error.modalRef.value);
+});
+
+function checkForKnownErrors() {
+    for (const knownError of knownErrors) {
+        const regex = knownError.regex;
+        if (props.miscInfo.match(regex)) {
+            knownError.modalRef.value = true;
+        }
+    }
+}
+
+watch(props, checkForKnownErrors, { immediate: true });
+
+function showHelp() {
+    showErrorHelp.value = true;
+}
+</script>
+
+<template>
+    <div class="info">
+        <b-modal v-if="sharingError" v-model="showErrorHelp" title="Dataset Sharing Misconfigured" ok-only>
+            <p>
+                This error message indicates that your history is setup to allow sharing but your job was run in a
+                configuration to target a storage location that explicitly disables sharing.
+            </p>
+            <p>
+                To fix this configure your history so that new datasets are private or target a different storage
+                location.
+            </p>
+            <p>
+                To re-configure your history, click the history menu and go to the "Set Permissions" option in the
+                dropdown. This should result in a toggle that allows you to configure the history so that new datasets
+                are created as private datasets.
+            </p>
+            <p>
+                There are many ways to instead target different storage for your job. This can be selected in the tool
+                or workflow form right before you execute your job or a different default for your history or user can
+                be chosen that allows for sharing.
+            </p>
+        </b-modal>
+        <span class="value">{{ miscInfo }} <a v-if="fixable" href="#" @click="showHelp">How do I fix this?</a></span>
+    </div>
+</template>
diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue
index df3f0a1d0e0f..98efa0bf11b8 100644
--- a/client/src/components/History/CurrentHistory/HistoryCounter.vue
+++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue
@@ -12,6 +12,7 @@ import { useRouter } from "vue-router/composables";
 import type { HistorySummary } from "@/api";
 import { HistoryFilters } from "@/components/History/HistoryFilters.js";
 import { useConfig } from "@/composables/config";
+import { useStorageLocationConfiguration } from "@/composables/storageLocation";
 import { useUserStore } from "@/stores/userStore";
 
 import { useDetailedHistory } from "./usesDetailedHistory";
@@ -19,6 +20,8 @@ import { useDetailedHistory } from "./usesDetailedHistory";
 import PreferredStorePopover from "./PreferredStorePopover.vue";
 import SelectPreferredStore from "./SelectPreferredStore.vue";
 
+const { isOnlyPreference } = useStorageLocationConfiguration();
+
 library.add(faDatabase, faEyeSlash, faHdd, faMapMarker, faSync, faTrash);
 
 const props = withDefaults(
@@ -54,6 +57,14 @@ const historyPreferredObjectStoreId = ref(props.history.preferred_object_store_i
 
 const niceHistorySize = computed(() => prettyBytes(historySize.value));
 
+const storageLocationTitle = computed(() => {
+    if (isOnlyPreference.value) {
+        return "History Preferred Storage Location";
+    } else {
+        return "History Storage Location";
+    }
+});
+
 function onDashboard() {
     router.push({ name: "HistoryOverviewInAnalysis", params: { historyId: props.history.id } });
 }
@@ -206,7 +217,7 @@ onMounted(() => {
 
             <BModal
                 v-model="showPreferredObjectStoreModal"
-                title="History Preferred Storage Location"
+                :title="storageLocationTitle"
                 modal-class="history-preferred-object-store-modal"
                 title-tag="h3"
                 size="sm"
diff --git a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
index b69b2c4008ed..5dba88d7b62c 100644
--- a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
+++ b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
@@ -2,8 +2,12 @@
 import { BPopover } from "bootstrap-vue";
 import { computed } from "vue";
 
+import { useStorageLocationConfiguration } from "@/composables/storageLocation";
+
 import ShowSelectedObjectStore from "@/components/ObjectStore/ShowSelectedObjectStore.vue";
 
+const { isOnlyPreference } = useStorageLocationConfiguration();
+
 interface Props {
     historyId: string;
     historyPreferredObjectStoreId?: string;
@@ -19,28 +23,40 @@ const preferredObjectStoreId = computed(() => {
     }
     return id;
 });
+
+const title = computed(() => {
+    if (isOnlyPreference.value) {
+        return "Preferred Storage Location";
+    } else {
+        return "Storage Location";
+    }
+});
 </script>
 
 <template>
     <BPopover :target="`history-storage-${historyId}`" triggers="hover" placement="bottomleft" boundary="window">
-        <template v-slot:title>Preferred Storage Location</template>
+        <template v-slot:title>{{ title }}</template>
         <div class="popover-wide">
+            <p>
+                <b
+                    >This option only affects new datasets created in this history. Existing history datasets will
+                    remain at their current storage location.</b
+                >
+            </p>
+
             <p v-if="historyPreferredObjectStoreId" class="history-preferred-object-store-inherited">
                 This storage location has been set at the history level.
             </p>
             <p v-else class="history-preferred-object-store-not-inherited">
-                This storage location has been inherited from your user preferences (set in User -> Preferences ->
-                Preferred Storage Location). If that option is updated, this history will target that new default.
+                This storage location has been inherited from your user preferences (set in
+                <router-link to="/user">User -> Preferences</router-link> -> {{ title }}). If that option is updated,
+                this history will target that new default.
             </p>
 
             <ShowSelectedObjectStore
                 v-if="preferredObjectStoreId"
                 :preferred-object-store-id="preferredObjectStoreId"
                 for-what="Galaxy will default to storing this history's datasets in " />
-
-            <div v-localize>
-                Change preferred storage location by clicking on the storage button in the history panel.
-            </div>
         </div>
     </BPopover>
 </template>
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index def41a60ff4d..1aa6287a6a07 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -3,6 +3,7 @@ import { storeToRefs } from "pinia";
 import { computed, ref } from "vue";
 
 import { ConcreteObjectStoreModel } from "@/api";
+import { useStorageLocationConfiguration } from "@/composables/storageLocation";
 import { useObjectStoreStore } from "@/stores/objectStoreStore";
 
 import ObjectStoreSelectButton from "./ObjectStoreSelectButton.vue";
@@ -25,6 +26,7 @@ const props = withDefaults(defineProps<SelectObjectStoreProps>(), {
 
 const store = useObjectStoreStore();
 const { isLoading, loadErrorMessage, selectableObjectStores } = storeToRefs(store);
+const { isOnlyPreference } = useStorageLocationConfiguration();
 
 const loadingObjectStoreInfoMessage = ref("Loading storage location information");
 const whyIsSelectionPreferredText = ref(`
@@ -64,7 +66,7 @@ async function handleSubmit(preferredObjectStore: ConcreteObjectStoreModel | nul
             <b-alert v-if="error" variant="danger" class="object-store-selection-error" show>
                 {{ error }}
             </b-alert>
-            <b-row>
+            <b-row align-h="center">
                 <b-col cols="7">
                     <b-button-group vertical size="lg" style="width: 100%">
                         <b-button
@@ -85,7 +87,7 @@ async function handleSubmit(preferredObjectStore: ConcreteObjectStoreModel | nul
                             @click="handleSubmit(objectStore)" />
                     </b-button-group>
                 </b-col>
-                <b-col cols="5">
+                <b-col v-if="isOnlyPreference" cols="5">
                     <p v-localize style="float: right">
                         {{ whyIsSelectionPreferredText }}
                     </p>
diff --git a/client/src/components/ObjectStore/showTargetPopoverMixin.js b/client/src/components/ObjectStore/showTargetPopoverMixin.js
index 66c68f4bfd5e..61f19c279871 100644
--- a/client/src/components/ObjectStore/showTargetPopoverMixin.js
+++ b/client/src/components/ObjectStore/showTargetPopoverMixin.js
@@ -1,3 +1,7 @@
+import { mapState } from "pinia";
+
+import { useConfigStore } from "@/stores/configurationStore";
+
 import ShowSelectedObjectStore from "./ShowSelectedObjectStore";
 
 export default {
@@ -11,8 +15,16 @@ export default {
         },
     },
     computed: {
+        ...mapState(useConfigStore, ["config"]),
+        preferredOrEmptyString() {
+            if (this.config?.object_store_always_respect_user_selection) {
+                return "";
+            } else {
+                return "Preferred";
+            }
+        },
         title() {
-            return this.l(`Preferred Target Storage Location ${this.titleSuffix || ""}`);
+            return this.l(`${this.preferredOrEmptyString} Target Storage Location ${this.titleSuffix || ""}`);
         },
     },
 };
diff --git a/client/src/components/Tool/ToolCard.vue b/client/src/components/Tool/ToolCard.vue
index f1df26492a1a..d28e4d46ad96 100644
--- a/client/src/components/Tool/ToolCard.vue
+++ b/client/src/components/Tool/ToolCard.vue
@@ -7,6 +7,7 @@ import { getAppRoot } from "onload/loadConfig";
 import { storeToRefs } from "pinia";
 import { computed, ref, watch } from "vue";
 
+import { useStorageLocationConfiguration } from "@/composables/storageLocation";
 import { useConfigStore } from "@/stores/configurationStore";
 import { useUserStore } from "@/stores/userStore";
 
@@ -83,12 +84,21 @@ function onSetError(e) {
     errorText.value = e;
 }
 
+const { isOnlyPreference } = useStorageLocationConfiguration();
 const { currentUser, isAnonymous } = storeToRefs(useUserStore());
 const { isLoaded: isConfigLoaded, config } = storeToRefs(useConfigStore());
 const hasUser = computed(() => !isAnonymous.value);
 const versions = computed(() => props.options.versions);
 const showVersions = computed(() => props.options.versions?.length > 1);
 
+const storageLocationModalTitle = computed(() => {
+    if (isOnlyPreference.value) {
+        return "Tool Execution Preferred Storage Location";
+    } else {
+        return "Tool Execution Storage Location";
+    }
+});
+
 const root = computed(() => getAppRoot());
 const showPreferredObjectStoreModal = ref(false);
 const toolPreferredObjectStoreId = ref(props.preferredObjectStoreId);
@@ -148,7 +158,7 @@ const showHelpForum = computed(() => isConfigLoaded.value && config.value.enable
                         </ToolTargetPreferredObjectStorePopover>
                         <b-modal
                             v-model="showPreferredObjectStoreModal"
-                            title="Tool Execution Preferred Storage Location"
+                            :title="storageLocationModalTitle"
                             modal-class="tool-preferred-object-store-modal"
                             title-tag="h3"
                             size="sm"
diff --git a/client/src/components/Tool/ToolHelpForum.vue b/client/src/components/Tool/ToolHelpForum.vue
index da592eba6035..a3b14d538e23 100644
--- a/client/src/components/Tool/ToolHelpForum.vue
+++ b/client/src/components/Tool/ToolHelpForum.vue
@@ -5,6 +5,7 @@ import { computed, onMounted, ref } from "vue";
 
 import { fetcher } from "@/api/schema";
 import { useConfigStore } from "@/stores/configurationStore";
+import { getShortToolId } from "@/utils/tool";
 
 import { createTopicUrl, type HelpForumPost, type HelpForumTopic, useHelpURLs } from "./helpForumUrls";
 
@@ -26,7 +27,8 @@ const helpAvailable = computed(() => topics.value.length > 0);
 
 const root = ref(null);
 
-const query = computed(() => `tags:${props.toolId}+${toolHelpTag} status:solved`);
+const shortToolId = computed(() => getShortToolId(props.toolId));
+const query = computed(() => `tags:${shortToolId.value}+${toolHelpTag} status:solved`);
 
 onMounted(async () => {
     const response = await helpFetcher({ query: query.value });
@@ -49,7 +51,7 @@ function blurbForTopic(topicId: number): string {
 
 const { createNewTopicUrl, searchTopicUrl } = useHelpURLs({
     title: computed(() => props.toolName),
-    tags: computed(() => [props.toolId, toolHelpTag]),
+    tags: computed(() => [shortToolId.value, toolHelpTag]),
     query,
 });
 
diff --git a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
index a88e5214335d..26dc9b790b7f 100644
--- a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
@@ -3,8 +3,9 @@
         <template v-slot:title>{{ title }}</template>
         <div class="popover-wide">
             <p v-if="toolPreferredObjectStoreId">
-                Preferred storage location has been set at the tool level, by default history or user preferences will
-                be used and if those are not set Galaxy will pick an administrator-configured default.
+                The {{ preferredOrEmptyString }} storage location has been set at the tool level, by default history or
+                user preferences will be used and if those are not set Galaxy will pick an administrator-configured
+                default.
             </p>
             <ShowSelectedObjectStore
                 v-if="toolPreferredObjectStoreId"
@@ -15,7 +16,8 @@
                 No selection has been made for this tool execution. Defaults from history, user, or Galaxy will be used.
             </div>
             <div v-localize>
-                Change preferred storage location by clicking on the storage button in the tool header.
+                Change {{ preferredOrEmptyString }} storage location by clicking on the storage button in the tool
+                header.
             </div>
         </div>
     </b-popover>
diff --git a/client/src/components/ToolRecommendation.vue b/client/src/components/ToolRecommendation.vue
index bf3e4f891bb8..7df9be1a2660 100644
--- a/client/src/components/ToolRecommendation.vue
+++ b/client/src/components/ToolRecommendation.vue
@@ -22,6 +22,8 @@ import { getCompatibleRecommendations } from "components/Workflow/Editor/modules
 import * as d3 from "d3";
 import { getAppRoot } from "onload/loadConfig";
 
+import { getShortToolId } from "@/utils/tool";
+
 export default {
     props: {
         toolId: {
@@ -38,12 +40,7 @@ export default {
     },
     computed: {
         getToolId() {
-            let toolId = this.toolId || "";
-            if (toolId.indexOf("/") > 0) {
-                const toolIdSlash = toolId.split("/");
-                toolId = toolIdSlash[toolIdSlash.length - 2];
-            }
-            return toolId;
+            return getShortToolId(this.toolId ?? "");
         },
     },
     created() {
diff --git a/client/src/components/User/UserPreferredObjectStore.vue b/client/src/components/User/UserPreferredObjectStore.vue
index e2c056ddae66..c51ab8b8b60f 100644
--- a/client/src/components/User/UserPreferredObjectStore.vue
+++ b/client/src/components/User/UserPreferredObjectStore.vue
@@ -7,17 +7,17 @@
                 v-b-modal.modal-select-preferred-object-store
                 class="preferred-storage"
                 href="javascript:void(0)"
-                ><b v-localize>Preferred Storage Location</b></a
+                ><b v-localize>{{ title }}</b></a
             >
             <div v-localize class="form-text text-muted">
-                Select a preferred storage location for the outputs of new jobs.
+                Select a {{ preferredOrEmptyString }} storage location for the outputs of new jobs.
             </div>
             <BModal
                 id="modal-select-preferred-object-store"
                 ref="modal"
                 v-model="showModal"
                 centered
-                title="Preferred Storage Location"
+                :title="title"
                 :title-tag="titleTag"
                 hide-footer
                 static
@@ -40,10 +40,13 @@
 import axios from "axios";
 import { BModal, BRow, VBModal } from "bootstrap-vue";
 import SelectObjectStore from "components/ObjectStore/SelectObjectStore";
+import { mapState } from "pinia";
 import { prependPath } from "utils/redirect";
 import { errorMessageAsString } from "utils/simple-error";
 import Vue from "vue";
 
+import { useConfigStore } from "@/stores/configurationStore";
+
 Vue.use(VBModal);
 
 export default {
@@ -76,6 +79,19 @@ export default {
                 "Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.",
         };
     },
+    computed: {
+        ...mapState(useConfigStore, ["config"]),
+        preferredOrEmptyString() {
+            if (this.config?.object_store_always_respect_user_selection) {
+                return "";
+            } else {
+                return "Preferred";
+            }
+        },
+        title() {
+            return `${this.preferredOrEmptyString} Storage Location`;
+        },
+    },
     methods: {
         resetModal() {},
         async handleSubmit(preferredObjectStoreId) {
diff --git a/client/src/components/Workflow/Editor/Recommendations.vue b/client/src/components/Workflow/Editor/Recommendations.vue
index 5d1153cb5744..81b741c11903 100644
--- a/client/src/components/Workflow/Editor/Recommendations.vue
+++ b/client/src/components/Workflow/Editor/Recommendations.vue
@@ -22,6 +22,7 @@ import LoadingSpan from "components/LoadingSpan";
 import _l from "utils/localization";
 
 import { useWorkflowStores } from "@/composables/workflowStores";
+import { getShortToolId } from "@/utils/tool";
 
 import { getToolPredictions } from "./modules/services";
 import { getCompatibleRecommendations } from "./modules/utilities";
@@ -59,11 +60,7 @@ export default {
     },
     methods: {
         getToolId(toolId) {
-            if (toolId !== undefined && toolId !== null && toolId.indexOf("/") > -1) {
-                const toolIdSlash = toolId.split("/");
-                toolId = toolIdSlash[toolIdSlash.length - 2];
-            }
-            return toolId;
+            return getShortToolId(toolId ?? "");
         },
         getWorkflowPath(currentNodeId) {
             const steps = {};
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
index 02ee504ddeed..876578e709c0 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
@@ -1,3 +1,4 @@
+import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
 import { findViaNavigation, getLocalVue } from "tests/jest/helpers";
 import { ROOT_COMPONENT } from "utils/navigation";
@@ -18,6 +19,7 @@ describe("WorkflowStorageConfiguration.vue", () => {
         wrapper = mount(WorkflowStorageConfiguration, {
             propsData,
             localVue,
+            pinia: createTestingPinia(),
         });
     }
 
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
index d6d9b03ea557..d67dc2b5a191 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
@@ -12,11 +12,7 @@
             :title-suffix="suffixPrimary"
             :invocation-preferred-object-store-id="selectedObjectStoreId">
         </WorkflowTargetPreferredObjectStorePopover>
-        <b-modal
-            v-model="showPreferredObjectStoreModal"
-            title="Invocation Preferred Storage Location"
-            v-bind="modalProps"
-            hide-footer>
+        <b-modal v-model="showPreferredObjectStoreModal" :title="primaryModalTitle" v-bind="modalProps" hide-footer>
             <WorkflowSelectPreferredObjectStore
                 :invocation-preferred-object-store-id="selectedObjectStoreId"
                 @updated="onUpdate" />
@@ -37,7 +33,7 @@
         </WorkflowTargetPreferredObjectStorePopover>
         <b-modal
             v-model="showIntermediatePreferredObjectStoreModal"
-            title="Invocation Preferred Storage Location (Intermediate Datasets)"
+            :title="intermediateModalTitle"
             v-bind="modalProps"
             hide-footer>
             <WorkflowSelectPreferredObjectStore
@@ -48,6 +44,10 @@
 </template>
 
 <script>
+import { mapState } from "pinia";
+
+import { useConfigStore } from "@/stores/configurationStore";
+
 import WorkflowSelectPreferredObjectStore from "./WorkflowSelectPreferredObjectStore";
 import WorkflowTargetPreferredObjectStorePopover from "./WorkflowTargetPreferredObjectStorePopover";
 
@@ -79,6 +79,20 @@ export default {
         };
     },
     computed: {
+        ...mapState(useConfigStore, ["config"]),
+        preferredOrEmptyString() {
+            if (this.config?.object_store_always_respect_user_selection) {
+                return "";
+            } else {
+                return "Preferred";
+            }
+        },
+        primaryModalTitle() {
+            return `Invocation ${this.preferredOrEmptyString} Storage Location`;
+        },
+        intermediateModalTitle() {
+            return `Invocation {{ preferredOrEmptyString }} Storage Location (Intermediate Datasets)`;
+        },
         suffixPrimary() {
             if (this.splitObjectStore) {
                 return ` (Workflow Output Datasets)`;
diff --git a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
index 989689d55a99..ba9bccf13a36 100644
--- a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
@@ -9,11 +9,12 @@
                 for-what="Galaxy will default to storing this tool run's output in">
             </ShowSelectedObjectStore>
             <div v-else>
-                No selection has been made for this worklfow invocation. Defaults from history, user, or Galaxy will be
+                No selection has been made for this workflow invocation. Defaults from history, user, or Galaxy will be
                 used.
             </div>
             <div v-localize>
-                Change preferred storage location by clicking on the storage button in the worklfow run header.
+                Change {{ preferredOrEmptyString }} storage location by clicking on the storage button in the worklfow
+                run header.
             </div>
         </div>
     </b-popover>
diff --git a/client/src/composables/storageLocation.ts b/client/src/composables/storageLocation.ts
new file mode 100644
index 000000000000..056ef8ef0b4a
--- /dev/null
+++ b/client/src/composables/storageLocation.ts
@@ -0,0 +1,15 @@
+import { computed } from "vue";
+
+import { useConfig } from "./config";
+
+export function useStorageLocationConfiguration() {
+    const { config } = useConfig();
+
+    const isOnlyPreference = computed(() => {
+        return !config.value || !config.value?.object_store_always_respect_user_selection;
+    });
+
+    return {
+        isOnlyPreference,
+    };
+}
diff --git a/client/src/utils/tool.ts b/client/src/utils/tool.ts
new file mode 100644
index 000000000000..941a1bba8c90
--- /dev/null
+++ b/client/src/utils/tool.ts
@@ -0,0 +1,12 @@
+/**
+ * Converts a long tool ID to a short tool id.
+ * If the passed in ID is short already, returns it.
+ * @param longId long tool-id
+ * @returns short tool-id
+ */
+export function getShortToolId(longId: string): string {
+    const toolIdSlash = longId.split("/");
+    const shortId = toolIdSlash[toolIdSlash.length - 2];
+
+    return shortId ?? longId;
+}
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 342933fe168b..2100c81f8cae 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -1521,6 +1521,20 @@
 :Type: int
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``object_store_always_respect_user_selection``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Set this to true to indicate in the UI that a user's object store
+    selection isn't simply a "preference" that job destinations often
+    respect but in fact will always be respected. This should be set
+    to true to simplify the UI as long as job destinations never
+    override 'object_store_id's for a jobs.
+:Default: ``false``
+:Type: bool
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 ``object_store_store_by``
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/admin/nginx.md b/doc/source/admin/nginx.md
index a943832d81e7..a76b8a6e564d 100644
--- a/doc/source/admin/nginx.md
+++ b/doc/source/admin/nginx.md
@@ -248,6 +248,9 @@ To enable it, add the following to your Galaxy's `server {}` block:
         location /_x_accel_redirect/ {
             internal;
             alias /;
+            # Add upstream response headers that would otherwise be omitted
+            add_header Access-Control-Allow-Origin $upstream_http_access_control_allow_origin;
+            add_header Access-Control-Allow-Methods $upstream_http_access_control_allow_methods;
         }
 ```
 
diff --git a/doc/source/releases/23.2_announce.rst b/doc/source/releases/23.2_announce.rst
index 8b07b2ec1f95..9a6aa84198ea 100644
--- a/doc/source/releases/23.2_announce.rst
+++ b/doc/source/releases/23.2_announce.rst
@@ -42,7 +42,6 @@ Administration Notes
 * Configuration options are now available for carbon emissions reporting. (`#16307 <https://github.com/galaxyproject/galaxy/pull/16307>`__)
 * The pgcleanup script has been modified to allow periodically deleting old datasets; operations can now be restricted to specific object store ids. (`#16340 <https://github.com/galaxyproject/galaxy/pull/16340>`__)
 * Tool memory usage has been improved. (`#16536 <https://github.com/galaxyproject/galaxy/pull/16536>`__)
-* Documentation added for tool panel and panel view administration. (`#17078 <https://github.com/galaxyproject/galaxy/pull/17078>`__)
 * Support added for cgroups-v2 (`#17169 <https://github.com/galaxyproject/galaxy/pull/17169>`__)
 * Support added for configuring job metrics inline; documentation improved (`#17178 <https://github.com/galaxyproject/galaxy/pull/17178>`__)
 
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index 823780a856f2..ea25af4fc4c4 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -1094,6 +1094,16 @@ mapping:
           Default cache size for caching object stores if cache not configured for
           that object store entry.
 
+      object_store_always_respect_user_selection:
+        type: bool
+        default: false
+        required: false
+        desc: |
+          Set this to true to indicate in the UI that a user's object store selection
+          isn't simply a "preference" that job destinations often respect but in fact
+          will always be respected. This should be set to true to simplify the UI as
+          long as job destinations never override 'object_store_id's for a jobs.
+
       object_store_store_by:
         type: str
         required: false
diff --git a/lib/galaxy/jobs/runners/__init__.py b/lib/galaxy/jobs/runners/__init__.py
index 27d122eb2b4a..e87d7c1b0091 100644
--- a/lib/galaxy/jobs/runners/__init__.py
+++ b/lib/galaxy/jobs/runners/__init__.py
@@ -203,9 +203,10 @@ def put(self, job_wrapper: "MinimalJobWrapper"):
             queue_job = job_wrapper.enqueue()
         except Exception as e:
             queue_job = False
-            # Required for exceptions thrown by object store incompatiblity.
+            # Required for exceptions thrown by object store incompatibility.
             # tested by test/integration/objectstore/test_private_handling.py
-            job_wrapper.fail(str(e), exception=e)
+            message = e.client_message if hasattr(e, "client_message") else str(e)
+            job_wrapper.fail(message, exception=e)
             log.debug(f"Job [{job_wrapper.job_id}] failed to queue {put_timer}")
             return
         if queue_job:
diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
index bb010dfd909d..14348c06742b 100644
--- a/lib/galaxy/managers/configuration.py
+++ b/lib/galaxy/managers/configuration.py
@@ -213,6 +213,7 @@ def _config_is_truthy(item, key, **context):
             ),
             "object_store_allows_id_selection": lambda item, key, **context: object_store.object_store_allows_id_selection(),
             "object_store_ids_allowing_selection": lambda item, key, **context: object_store.object_store_ids_allowing_selection(),
+            "object_store_always_respect_user_selection": _use_config,
             "user_activation_on": _use_config,
             "user_library_import_dir_available": lambda item, key, **context: bool(item.get("user_library_import_dir")),
             "welcome_directory": _use_config,
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 235eb89ee3e8..c329de423355 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -6276,11 +6276,10 @@ def attribute_columns(column_collection, attributes, nesting_level=None):
             q = q.outerjoin(inner_dce, inner_dce.c.dataset_collection_id == dce.c.child_collection_id)
             if collection_attributes:
                 q = q.join(inner_dc, inner_dc.c.id == dce.c.child_collection_id)
-            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
-            if collection_attributes:
                 q = q.add_columns(
                     *attribute_columns(inner_dc.c, collection_attributes, nesting_level),
                 )
+            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
             dce = inner_dce
             dc = inner_dc
             depth_collection_type = depth_collection_type.split(":", 1)[1]
@@ -10913,7 +10912,7 @@ def __repr__(self):
     Column("blurb", TrimmedString(255)),
     Column("peek", TEXT, key="_peek"),
     Column("tool_version", TEXT),
-    Column("extension", TrimmedString(64)),
+    Column("extension", TrimmedString(64), index=True),
     Column("metadata", MetadataType, key="_metadata"),
     Column("metadata_deferred", Boolean, key="metadata_deferred"),
     Column("parent_id", Integer, ForeignKey("history_dataset_association.id"), nullable=True),
diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/55f02fd8ab6c_add_index_on_hda_extension.py b/lib/galaxy/model/migrations/alembic/versions_gxy/55f02fd8ab6c_add_index_on_hda_extension.py
new file mode 100644
index 000000000000..50a43f87d147
--- /dev/null
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/55f02fd8ab6c_add_index_on_hda_extension.py
@@ -0,0 +1,32 @@
+"""Add index on history_dataset_association extension
+
+Revision ID: 55f02fd8ab6c
+Revises: 2dc3386d091f
+Create Date: 2024-03-25 11:14:40.005394
+
+"""
+
+from galaxy.model.database_object_names import build_index_name
+from galaxy.model.migrations.util import (
+    create_index,
+    drop_index,
+)
+
+# revision identifiers, used by Alembic.
+revision = "55f02fd8ab6c"
+down_revision = "2dc3386d091f"
+branch_labels = None
+depends_on = None
+
+
+hda_table_name = "history_dataset_association"
+hda_extension_column_name = "extension"
+hda_extension_index_name = build_index_name(hda_table_name, hda_extension_column_name)
+
+
+def upgrade():
+    create_index(hda_extension_index_name, hda_table_name, [hda_extension_column_name])
+
+
+def downgrade():
+    drop_index(hda_extension_index_name, hda_table_name)
diff --git a/lib/galaxy/model/migrations/dbscript.py b/lib/galaxy/model/migrations/dbscript.py
index acc2d907310b..a9371ca0a9ae 100644
--- a/lib/galaxy/model/migrations/dbscript.py
+++ b/lib/galaxy/model/migrations/dbscript.py
@@ -40,8 +40,8 @@
     "23.1": "e93c5d0b47a9",
     "release_23.2": "8a19186a6ee7",
     "23.2": "8a19186a6ee7",
-    "release_24.0": "8a19186a6ee7",
-    "24.0": "8a19186a6ee7",
+    "release_24.0": "55f02fd8ab6c",
+    "24.0": "55f02fd8ab6c",
 }
 
 
diff --git a/lib/galaxy/model/security.py b/lib/galaxy/model/security.py
index 8769c132c3db..7a761d562edb 100644
--- a/lib/galaxy/model/security.py
+++ b/lib/galaxy/model/security.py
@@ -765,12 +765,16 @@ def create_private_user_role(self, user):
         return self.get_private_user_role(user)
 
     def get_private_user_role(self, user, auto_create=False):
-        stmt = select(Role).where(
-            and_(
-                UserRoleAssociation.user_id == user.id,
-                Role.id == UserRoleAssociation.role_id,
-                Role.type == Role.types.PRIVATE,
+        stmt = (
+            select(Role)
+            .where(
+                and_(
+                    UserRoleAssociation.user_id == user.id,
+                    Role.id == UserRoleAssociation.role_id,
+                    Role.type == Role.types.PRIVATE,
+                )
             )
+            .distinct()
         )
         role = self.sa_session.execute(stmt).scalar_one_or_none()
         if not role:
diff --git a/lib/galaxy/objectstore/__init__.py b/lib/galaxy/objectstore/__init__.py
index 0346b2b8c60f..da023ee13bee 100644
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -1613,6 +1613,22 @@ def ids_per_quota_source(self, include_default_quota_source=False):
         return quota_sources
 
 
+class ObjectCreationProblem(Exception):
+    pass
+
+
+# Calling these client_message to make it clear they should use the language of the
+# Galaxy UI/UX - for instance "storage location" not "objectstore".
+class ObjectCreationProblemSharingDisabled(ObjectCreationProblem):
+    client_message = "Job attempted to create sharable output datasets in a storage location with sharing disabled"
+
+
+class ObjectCreationProblemStoreFull(ObjectCreationProblem):
+    client_message = (
+        "Job attempted to create output datasets in a full storage location, please contact your admin for more details"
+    )
+
+
 class ObjectStorePopulator:
     """Small helper for interacting with the object store and making sure all
     datasets from a job end up with the same object_store_id.
@@ -1639,9 +1655,9 @@ def set_dataset_object_store_id(self, dataset, require_shareable=True):
             ensure_non_private = require_shareable
             concrete_store = self.object_store.create(dataset, ensure_non_private=ensure_non_private)
             if concrete_store.private and require_shareable:
-                raise Exception("Attempted to create shared output datasets in objectstore with sharing disabled")
+                raise ObjectCreationProblemSharingDisabled()
         except ObjectInvalid:
-            raise Exception("Unable to create output dataset: object store is full")
+            raise ObjectCreationProblemStoreFull()
         self.object_store_id = dataset.object_store_id  # these will be the same thing after the first output
 
 
diff --git a/lib/galaxy/schema/help.py b/lib/galaxy/schema/help.py
index 67b34e48f16a..ebe2da9370db 100644
--- a/lib/galaxy/schema/help.py
+++ b/lib/galaxy/schema/help.py
@@ -54,14 +54,16 @@ class HelpForumTopic(Model):
     archetype: Annotated[Any, Field(description="The archetype of the topic.")]
     unseen: Annotated[bool, Field(description="Whether the topic is unseen.")]
     pinned: Annotated[bool, Field(description="Whether the topic is pinned.")]
-    unpinned: Annotated[Optional[bool], Field(description="Whether the topic is unpinned.")]
+    unpinned: Annotated[Optional[bool], Field(default=None, description="Whether the topic is unpinned.")]
     visible: Annotated[bool, Field(description="Whether the topic is visible.")]
     closed: Annotated[bool, Field(description="Whether the topic is closed.")]
     archived: Annotated[bool, Field(description="Whether the topic is archived.")]
-    bookmarked: Annotated[Optional[bool], Field(description="Whether the topic is bookmarked.")]
-    liked: Annotated[Optional[bool], Field(description="Whether the topic is liked.")]
+    bookmarked: Annotated[Optional[bool], Field(default=None, description="Whether the topic is bookmarked.")]
+    liked: Annotated[Optional[bool], Field(default=None, description="Whether the topic is liked.")]
     tags: Annotated[List[str], Field(description="The tags of the topic.")]
-    tags_descriptions: Annotated[Optional[Any], Field(description="The descriptions of the tags of the topic.")]
+    tags_descriptions: Annotated[
+        Optional[Any], Field(default=None, description="The descriptions of the tags of the topic.")
+    ]
     category_id: Annotated[int, Field(description="The ID of the category of the topic.")]
     has_accepted_answer: Annotated[bool, Field(description="Whether the topic has an accepted answer.")]
 
@@ -102,10 +104,23 @@ class HelpForumSearchResponse(Model):
     This model is based on the Discourse API response for the search endpoint.
     """
 
-    posts: Optional[List[HelpForumPost]]
-    topics: Optional[List[HelpForumTopic]]
-    users: Optional[List[HelpForumUser]]
-    categories: Optional[List[HelpForumCategory]]
-    tags: Optional[List[HelpForumTag]]
-    groups: Optional[List[HelpForumGroup]]
-    grouped_search_result: Optional[HelpForumGroupedSearchResult]
+    posts: Annotated[List[HelpForumPost], Field(default=None, description="The list of posts returned by the search.")]
+    topics: Annotated[
+        List[HelpForumTopic], Field(default=None, description="The list of topics returned by the search.")
+    ]
+    users: Annotated[
+        Optional[List[HelpForumUser]], Field(default=None, description="The list of users returned by the search.")
+    ]
+    categories: Annotated[
+        Optional[List[HelpForumCategory]],
+        Field(default=None, description="The list of categories returned by the search."),
+    ]
+    tags: Annotated[
+        Optional[List[HelpForumTag]], Field(default=None, description="The list of tags returned by the search.")
+    ]
+    groups: Annotated[
+        Optional[List[HelpForumGroup]], Field(default=None, description="The list of groups returned by the search.")
+    ]
+    grouped_search_result: Annotated[
+        Optional[HelpForumGroupedSearchResult], Field(default=None, description="The grouped search result.")
+    ]