diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml
index d4833d376ab..359edf8b0d9 100644
--- a/.github/workflows/converter_tests.yaml
+++ b/.github/workflows/converter_tests.yaml
@@ -68,7 +68,7 @@ jobs:
       - name: Run tests
         run: |
           mapfile -t TOOL_ARRAY < tool_list.txt
-          planemo test --galaxy_python_version ${{ matrix.python-version }} --galaxy_root 'galaxy root' "${TOOL_ARRAY[@]}"
+          planemo test --biocontainers --galaxy_python_version ${{ matrix.python-version }} --galaxy_root 'galaxy root' "${TOOL_ARRAY[@]}"
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
diff --git a/client/src/components/History/Modals/CopyModal.vue b/client/src/components/History/Modals/CopyModal.vue
index 86a2c3fb58e..fa5a9b180ac 100644
--- a/client/src/components/History/Modals/CopyModal.vue
+++ b/client/src/components/History/Modals/CopyModal.vue
@@ -2,7 +2,7 @@
     <b-modal v-bind="$attrs" :title="title" title-tag="h2" v-on="$listeners">
         <transition name="fade">
             <b-alert v-localize :show="isAnonymous" variant="warning">
-                As an anonymous user, unless you login or register, you will lose your current history after copying
+                As an anonymous user, unless you log in or register, you will lose your current history after copying
                 this history. You can <a href="/user/login">log in here</a> or <a href="/user/create">register here</a>.
             </b-alert>
         </transition>
diff --git a/client/src/components/Login/RegisterForm.vue b/client/src/components/Login/RegisterForm.vue
index cd3b3cb192b..478917fc269 100644
--- a/client/src/components/Login/RegisterForm.vue
+++ b/client/src/components/Login/RegisterForm.vue
@@ -3,7 +3,8 @@
         <div class="row justify-content-md-center">
             <div class="col col-lg-6">
                 <b-alert :show="!!registrationWarningMessage" variant="info">
-                    {{ registrationWarningMessage }}
+                    <!-- eslint-disable-next-line vue/no-v-html -->
+                    <span v-html="registrationWarningMessage" />
                 </b-alert>
                 <b-alert :show="!!messageText" :variant="messageVariant">
                     {{ messageText }}
@@ -64,19 +65,18 @@
                                         dashes ('.', '_', '-').
                                     </b-form-text>
                                 </b-form-group>
-                                <b-form-group
-                                    v-if="mailingJoinAddr && serverMailConfigured"
-                                    :label="labelSubscribe"
-                                    label-for="register-form-subscribe">
-                                    <input
+                                <b-form-group v-if="mailingJoinAddr && serverMailConfigured">
+                                    <b-form-checkbox
                                         id="register-form-subscribe"
                                         v-model="subscribe"
                                         name="subscribe"
-                                        type="checkbox" />
+                                        type="checkbox">
+                                        {{ labelSubscribe }}
+                                    </b-form-checkbox>
                                 </b-form-group>
-                                <b-button v-localize name="create" type="submit" :disabled="disableCreate"
-                                    >Create</b-button
-                                >
+                                <b-button v-localize name="create" type="submit" :disabled="disableCreate">
+                                    Create
+                                </b-button>
                             </b-card-body>
                         </b-collapse>
                         <b-card-footer v-if="showLoginLink">
@@ -93,8 +93,9 @@
                     </b-card>
                 </b-form>
             </div>
-            <div v-if="termsUrl" class="col">
-                <b-embed type="iframe" :src="termsUrl" aspect="1by1" />
+            <div v-if="termsUrl" class="col position-relative embed-container">
+                <iframe title="terms-of-use" :src="termsUrl" frameborder="0" class="terms-iframe"></iframe>
+                <div v-localize class="scroll-hint">↓ Scroll to review ↓</div>
             </div>
         </div>
     </div>
@@ -204,3 +205,26 @@ export default {
     },
 };
 </script>
+<style scoped>
+.embed-container {
+    position: relative;
+}
+
+.scroll-hint {
+    position: absolute;
+    bottom: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+    background-color: rgba(255, 255, 255, 0.9);
+    border: 1px solid #ccc;
+    padding: 2px 5px;
+    border-radius: 4px;
+}
+
+.terms-iframe {
+    width: 100%;
+    height: 90vh;
+    border: none;
+    overflow-y: auto;
+}
+</style>
diff --git a/client/src/components/PageDisplay/PageDisplay.vue b/client/src/components/PageDisplay/PageDisplay.vue
index 6b7fb048ee2..4f9c34ac862 100644
--- a/client/src/components/PageDisplay/PageDisplay.vue
+++ b/client/src/components/PageDisplay/PageDisplay.vue
@@ -8,6 +8,7 @@
                     :enable_beta_markdown_export="config.enable_beta_markdown_export"
                     :download-endpoint="stsUrl(config)"
                     :export-link="exportUrl"
+                    :read-only="!userOwnsPage"
                     @onEdit="onEdit" />
                 <PageHtml v-else :page="page" />
             </div>
@@ -17,7 +18,10 @@
 </template>
 
 <script>
+import { storeToRefs } from "pinia";
+
 import { useConfig } from "@/composables/config";
+import { useUserStore } from "@/stores/userStore";
 import { withPrefix } from "@/utils/redirect";
 import { urlData } from "@/utils/url";
 
@@ -39,7 +43,9 @@ export default {
     },
     setup() {
         const { config, isConfigLoaded } = useConfig(true);
-        return { config, isConfigLoaded };
+        const userStore = useUserStore();
+        const { currentUser } = storeToRefs(userStore);
+        return { config, currentUser, isConfigLoaded };
     },
     data() {
         return {
@@ -47,6 +53,9 @@ export default {
         };
     },
     computed: {
+        userOwnsPage() {
+            return this.currentUser.username === this.page.username;
+        },
         dataUrl() {
             return `/api/pages/${this.pageId}`;
         },
diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js
index 1f75398d356..7badb524ee3 100644
--- a/client/src/entry/analysis/menu.js
+++ b/client/src/entry/analysis/menu.js
@@ -166,7 +166,7 @@ export function fetchMenu(options = {}) {
         if (options.allow_user_creation) {
             userTab = {
                 id: "user",
-                title: _l("Login or Register"),
+                title: _l("Log in or Register"),
                 cls: "loggedout-only",
                 url: "/login",
                 tooltip: _l("Log in or register a new account"),
diff --git a/client/src/nls/de/locale.js b/client/src/nls/de/locale.js
index 9dd6ebcc508..6ebc15a2184 100644
--- a/client/src/nls/de/locale.js
+++ b/client/src/nls/de/locale.js
@@ -23,7 +23,7 @@ define({
     User: "Benutzer",
     Login: "Anmeldung",
     Register: "Neu registrieren",
-    "Login or Register": "Einloggen oder Registrieren",
+    "Log in or Register": "Einloggen oder Registrieren",
     "Signed in as": "Angemeldet als",
     Preferences: "Präferenzen",
     "Custom Builds": "Custom Builds",
diff --git a/client/src/nls/es/locale.js b/client/src/nls/es/locale.js
index 853e85bd07a..df68712e1d1 100644
--- a/client/src/nls/es/locale.js
+++ b/client/src/nls/es/locale.js
@@ -54,7 +54,7 @@ define({
 
     Register: "Registro",
 
-    "Login or Register": "Iniciar sesión o Registrarse",
+    "Log in or Register": "Iniciar sesión o Registrarse",
     "Subscribe to mailing list": false,
     "Already have an account?": false,
     "Log in here.": false,
diff --git a/client/src/nls/fr/locale.js b/client/src/nls/fr/locale.js
index 30de4aa8413..a9e73af3d0c 100644
--- a/client/src/nls/fr/locale.js
+++ b/client/src/nls/fr/locale.js
@@ -24,7 +24,7 @@ define({
     User: "Utilisateur",
     Login: "Authentification",
     Register: "Enregistrement",
-    "Login or Register": "Authentification et Enregistrement",
+    "Log in or Register": "Authentification et Enregistrement",
     "Signed in as": "Authentifié en tant que",
     Preferences: "Préférences",
     "Custom Builds": "Mes génomes Builds de référence",
diff --git a/client/src/nls/ja/locale.js b/client/src/nls/ja/locale.js
index 2670a2153a2..02208bbf63f 100644
--- a/client/src/nls/ja/locale.js
+++ b/client/src/nls/ja/locale.js
@@ -26,7 +26,7 @@ define({
     User: "ユーザー",
     Login: "ログイン",
     Register: "登録",
-    "Login or Register": "ログイン/登録",
+    "Log in or Register": "ログイン/登録",
     Preferences: "設定",
     "Custom Builds": "カスタムビルド",
     Logout: "ログアウト",
diff --git a/client/src/nls/locale.js b/client/src/nls/locale.js
index 93e1ff21285..1990a842848 100644
--- a/client/src/nls/locale.js
+++ b/client/src/nls/locale.js
@@ -25,7 +25,7 @@ define({
         User: false,
         Login: false,
         Register: false,
-        "Login or Register": false,
+        "Log in or Register": false,
         "Signed in as": false,
         Preferences: false,
         "Custom Builds": false,
diff --git a/client/src/nls/zh/locale.js b/client/src/nls/zh/locale.js
index c271382665e..8b6526c3171 100644
--- a/client/src/nls/zh/locale.js
+++ b/client/src/nls/zh/locale.js
@@ -26,7 +26,7 @@ define({
     User: "账号管理",
     Login: "登陆",
     Register: "注册",
-    "Login or Register": "注册登陆",
+    "Log in or Register": "注册登陆",
     "Signed in as": "您已登陆为",
     Preferences: "用户偏好性",
     "Custom Builds": "自定义构建集",
diff --git a/config/plugins/visualizations/example/package.json b/config/plugins/visualizations/example/package.json
index cb2756ba8d3..e5562454991 100644
--- a/config/plugins/visualizations/example/package.json
+++ b/config/plugins/visualizations/example/package.json
@@ -1,13 +1,13 @@
 {
     "name": "visualization",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "keywords": [
         "galaxy",
         "visualization"
     ],
     "license": "AFL-3.0",
     "dependencies": {
-        "@galaxyproject/charts": "^0.0.6",
+        "@galaxyproject/charts": "^0.1.0",
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
diff --git a/config/plugins/visualizations/heatmap/heatmap_default/package.json b/config/plugins/visualizations/heatmap/heatmap_default/package.json
index bf49f6d9b86..cba60b4093a 100644
--- a/config/plugins/visualizations/heatmap/heatmap_default/package.json
+++ b/config/plugins/visualizations/heatmap/heatmap_default/package.json
@@ -1,13 +1,13 @@
 {
     "name": "visualization",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "keywords": [
         "galaxy",
         "visualization"
     ],
     "license": "AFL-3.0",
     "dependencies": {
-        "@galaxyproject/charts": "^0.0.6",
+        "@galaxyproject/charts": "^0.1.0",
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.4.0",
         "bootstrap": "^3.3.7",
diff --git a/config/plugins/visualizations/jqplot/jqplot_bar/package.json b/config/plugins/visualizations/jqplot/jqplot_bar/package.json
index 7f5643b92ac..742ba614614 100644
--- a/config/plugins/visualizations/jqplot/jqplot_bar/package.json
+++ b/config/plugins/visualizations/jqplot/jqplot_bar/package.json
@@ -1,13 +1,13 @@
 {
     "name": "visualization",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "keywords": [
         "galaxy",
         "visualization"
     ],
     "license": "AFL-3.0",
     "dependencies": {
-        "@galaxyproject/charts": "^0.0.6",
+        "@galaxyproject/charts": "^0.1.0",
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
diff --git a/config/plugins/visualizations/nvd3/nvd3_bar/package.json b/config/plugins/visualizations/nvd3/nvd3_bar/package.json
index f3a30d2f994..fc0090764f9 100644
--- a/config/plugins/visualizations/nvd3/nvd3_bar/package.json
+++ b/config/plugins/visualizations/nvd3/nvd3_bar/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nvd3",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "NVD3 visualization plugin.",
     "keywords": [
         "galaxy",
@@ -9,7 +9,7 @@
     ],
     "license": "AFL-3.0",
     "dependencies": {
-        "@galaxyproject/charts": "^0.0.6",
+        "@galaxyproject/charts": "^0.1.0",
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
diff --git a/config/plugins/visualizations/venn/package.json b/config/plugins/visualizations/venn/package.json
index eb2e809f4d6..ebe3b006423 100644
--- a/config/plugins/visualizations/venn/package.json
+++ b/config/plugins/visualizations/venn/package.json
@@ -1,13 +1,13 @@
 {
     "name": "visualization",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "keywords": [
         "galaxy",
         "visualization"
     ],
     "license": "AFL-3.0",
     "dependencies": {
-        "@galaxyproject/charts": "^0.0.6",
+        "@galaxyproject/charts": "^0.1.0",
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index f754ad8be39..7d05a3f82cb 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -156,6 +156,7 @@ pyyaml==6.0.1 ; python_version >= "3.7" and python_version < "3.12"
 pyzmq==25.1.1 ; python_version >= "3.7" and python_version < "3.12"
 rdflib==6.2.0 ; python_version >= "3.7" and python_version < "3.12"
 refgenconf==0.12.2 ; python_version >= "3.7" and python_version < "3.12"
+regex==2023.8.8 ; python_version >= "3.7" and python_version < "3.12"
 repoze-lru==0.7 ; python_version >= "3.7" and python_version < "3.12"
 requests-oauthlib==1.3.1 ; python_version >= "3.7" and python_version < "3.12"
 requests-toolbelt==1.0.0 ; python_version >= "3.7" and python_version < "3.12"
diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py
index c64fde8c0f5..aa3ee8cb6f1 100644
--- a/lib/galaxy/jobs/runners/pulsar.py
+++ b/lib/galaxy/jobs/runners/pulsar.py
@@ -2,7 +2,7 @@
 
 More information on Pulsar can be found at https://pulsar.readthedocs.io/ .
 """
-
+import copy
 import errno
 import logging
 import os
@@ -12,6 +12,7 @@ from time import sleep
 from typing import (
     Any,
     Dict,
+    Optional,
 )
 
 import pulsar.core
@@ -54,7 +55,6 @@ from galaxy.util import (
     specs,
     string_as_bool_or_none,
 )
-from galaxy.util.bunch import Bunch
 
 log = logging.getLogger(__name__)
 
@@ -466,7 +466,7 @@ class PulsarJobRunner(AsynchronousJobRunner):
         command_line = None
         client = None
         remote_job_config = None
-        compute_environment = None
+        compute_environment: Optional[PulsarComputeEnvironment] = None
         remote_container = None
 
         fail_or_resubmit = False
@@ -492,7 +492,13 @@ class PulsarJobRunner(AsynchronousJobRunner):
             self.__prepare_input_files_locally(job_wrapper)
             remote_metadata = PulsarJobRunner.__remote_metadata(client)
             dependency_resolution = PulsarJobRunner.__dependency_resolution(client)
-            metadata_kwds = self.__build_metadata_configuration(client, job_wrapper, remote_metadata, remote_job_config)
+            metadata_kwds = self.__build_metadata_configuration(
+                client,
+                job_wrapper,
+                remote_metadata,
+                remote_job_config,
+                compute_environment=compute_environment,
+            )
             remote_working_directory = remote_job_config["working_directory"]
             remote_job_directory = os.path.abspath(os.path.join(remote_working_directory, os.path.pardir))
             remote_tool_directory = os.path.abspath(os.path.join(remote_job_directory, "tool_files"))
@@ -896,15 +902,16 @@ class PulsarJobRunner(AsynchronousJobRunner):
     def __rewrite_parameters(pulsar_client):
         return string_as_bool_or_none(pulsar_client.destination_params.get("rewrite_parameters", False)) or False
 
-    def __build_metadata_configuration(self, client, job_wrapper, remote_metadata, remote_job_config):
-        metadata_kwds = {}
-        if remote_metadata and not job_wrapper.use_metadata_binary:
-            remote_system_properties = remote_job_config.get("system_properties", {})
-            remote_galaxy_home = remote_system_properties.get("galaxy_home", None)
-            if not remote_galaxy_home:
-                raise Exception(NO_REMOTE_GALAXY_FOR_METADATA_MESSAGE)
-            metadata_kwds["exec_dir"] = remote_galaxy_home
-            outputs_directory = remote_job_config["outputs_directory"]
+    def __build_metadata_configuration(
+        self,
+        client,
+        job_wrapper,
+        remote_metadata,
+        remote_job_config,
+        compute_environment: Optional["PulsarComputeEnvironment"] = None,
+    ):
+        metadata_kwds: Dict[str, Any] = {}
+        if remote_metadata:
             working_directory = remote_job_config["working_directory"]
             metadata_directory = remote_job_config["metadata_directory"]
             # For metadata calculation, we need to build a list of of output
@@ -912,29 +919,44 @@ class PulsarJobRunner(AsynchronousJobRunner):
             # and false path indicating location on compute server. Since the
             # Pulsar disables from_work_dir copying as part of the job command
             # line we need to take the list of output locations on the Pulsar
-            # server (produced by self.get_output_files(job_wrapper)) and for
+            # server (produced by job_wrapper.job_io.get_output_fnames() and for
             # each work_dir output substitute the effective path on the Pulsar
             # server relative to the remote working directory as the
             # false_path to send the metadata command generation module.
             work_dir_outputs = self.get_work_dir_outputs(job_wrapper, tool_working_directory=working_directory)
-            outputs = [
-                Bunch(false_path=os.path.join(outputs_directory, os.path.basename(path)), real_path=path)
-                for path in self.get_output_files(job_wrapper)
-            ]
-            for output in outputs:
-                for pulsar_workdir_path, real_path in work_dir_outputs:
-                    if real_path == output.real_path:
-                        output.false_path = pulsar_workdir_path
-            metadata_kwds["output_fnames"] = outputs
-            metadata_kwds["compute_tmp_dir"] = metadata_directory
-            metadata_kwds["config_root"] = remote_galaxy_home
-            default_config_file = os.path.join(remote_galaxy_home, "config/galaxy.ini")
-            metadata_kwds["config_file"] = remote_system_properties.get("galaxy_config_file", default_config_file)
-            metadata_kwds["dataset_files_path"] = remote_system_properties.get("galaxy_dataset_files_path", None)
+            outputs = job_wrapper.job_io.get_output_fnames()
+            # copy fixes 'test/integration/test_pulsar_embedded_remote_metadata.py::test_tools[job_properties]'
+            real_path_to_output = {o.real_path: copy.copy(o) for o in outputs}
+            rewritten_outputs = []
+            for pulsar_workdir_path, real_path in work_dir_outputs:
+                work_dir_output = real_path_to_output.pop(real_path, None)
+                if work_dir_output:
+                    work_dir_output.false_path = pulsar_workdir_path
+                    rewritten_outputs.append(work_dir_output)
+
+            for output in real_path_to_output.values():
+                if compute_environment:
+                    output.false_path = compute_environment.path_mapper.remote_output_path_rewrite(str(output))
+                rewritten_outputs.append(output)
+
+            metadata_kwds["output_fnames"] = rewritten_outputs
+            remote_system_properties = remote_job_config.get("system_properties", {})
+            remote_galaxy_home = remote_system_properties.get("galaxy_home")
+            if not job_wrapper.use_metadata_binary:
+                if not remote_galaxy_home:
+                    raise Exception(NO_REMOTE_GALAXY_FOR_METADATA_MESSAGE)
+                metadata_kwds["exec_dir"] = remote_galaxy_home
+                metadata_kwds["compute_tmp_dir"] = metadata_directory
+                metadata_kwds["config_root"] = remote_galaxy_home
+                default_config_file = os.path.join(remote_galaxy_home, "config/galaxy.ini")
+                metadata_kwds["config_file"] = remote_system_properties.get("galaxy_config_file", default_config_file)
+                metadata_kwds["dataset_files_path"] = remote_system_properties.get("galaxy_dataset_files_path", None)
             if PulsarJobRunner.__use_remote_datatypes_conf(client):
-                remote_datatypes_config = remote_system_properties.get("galaxy_datatypes_config_file", None)
+                remote_datatypes_config = remote_system_properties.get("galaxy_datatypes_config_file")
                 if not remote_datatypes_config:
                     log.warning(NO_REMOTE_DATATYPES_CONFIG)
+                    if not remote_galaxy_home:
+                        raise Exception(NO_REMOTE_GALAXY_FOR_METADATA_MESSAGE)
                     remote_datatypes_config = os.path.join(remote_galaxy_home, "datatypes_conf.xml")
                 metadata_kwds["datatypes_config"] = remote_datatypes_config
             else:
diff --git a/lib/galaxy/metadata/set_metadata.py b/lib/galaxy/metadata/set_metadata.py
index e4ce5317365..ff9380ece0b 100644
--- a/lib/galaxy/metadata/set_metadata.py
+++ b/lib/galaxy/metadata/set_metadata.py
@@ -83,6 +83,15 @@ def reset_external_filename(dataset_instance: DatasetInstance):
     dataset_instance.dataset.extra_files_path = None
 
 
+def push_if_necessary(object_store: ObjectStore, dataset: DatasetInstance, external_filename):
+    # Here we might be updating a disk based objectstore when outputs_to_working_directory is used,
+    # or a remote object store from its cache path.
+    # empty files could happen when outputs are discovered from working dir,
+    # empty file check needed for e.g. test/integration/test_extended_metadata_outputs_to_working_directory.py::test_tools[multi_output_assign_primary]
+    if os.path.getsize(external_filename):
+        object_store.update_from_file(dataset.dataset, file_name=external_filename, create=True)
+
+
 def set_validated_state(dataset_instance):
     datatype_validation = validate(dataset_instance)
 
@@ -399,9 +408,7 @@ def set_metadata_portable(
                 if not link_data_only:
                     # Only set external filename if we're dealing with files in job working directory.
                     # Fixes link_data_only uploads
-                    if not object_store:
-                        # overriding the external filename would break pushing to object stores
-                        dataset.dataset.external_filename = external_filename
+                    dataset.dataset.external_filename = external_filename
                     # We derive extra_files_dir_name from external_filename, because OutputsToWorkingDirectoryPathRewriter
                     # always rewrites the path to include the uuid, even if store_by is set to id, and the extra files
                     # rewrite is derived from the dataset path (since https://github.com/galaxyproject/galaxy/pull/16541).
@@ -437,15 +444,11 @@ def set_metadata_portable(
                 if not object_store or not export_store:
                     # Can't happen, but type system doesn't know
                     raise Exception("object_store not built")
-                if not is_deferred and not link_data_only and os.path.getsize(external_filename):
-                    # Here we might be updating a disk based objectstore when outputs_to_working_directory is used,
-                    # or a remote object store from its cache path.
+                if not is_deferred and not link_data_only:
                     object_store_update_actions.append(
-                        partial(
-                            object_store.update_from_file, dataset.dataset, file_name=external_filename, create=True
-                        )
+                        partial(push_if_necessary, object_store, dataset, external_filename)
                     )
-                    object_store_update_actions.append(partial(reset_external_filename, dataset))
+                object_store_update_actions.append(partial(reset_external_filename, dataset))
                 object_store_update_actions.append(partial(export_store.add_dataset, dataset))
                 if dataset_instance_id not in unnamed_id_to_path:
                     object_store_update_actions.append(partial(collect_extra_files, object_store, dataset, "."))
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 1a2df7343b3..30d16f4f052 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -718,9 +718,7 @@ class NavigatesGalaxy(HasDriver):
         except SeleniumTimeoutException as e:
             ui_logged_out = self.components.masthead.logged_out_only.is_displayed
             if ui_logged_out:
-                dom_message = (
-                    "Element a.loggedout-only is present in DOM, indicating Login or Register button still in masthead."
-                )
+                dom_message = "Element a.loggedout-only is present in DOM, indicating Log in or Register button still in masthead."
             else:
                 dom_message = "Element a.loggedout-only is *not* present in DOM."
             user_info = self.api_get("users/current")
@@ -1910,7 +1908,7 @@ class NavigatesGalaxy(HasDriver):
         try:
             self.components.masthead.logged_out_only.wait_for_visible()
         except SeleniumTimeoutException as e:
-            message = "Clicked logout button but waiting for 'Login or Registration' button failed, perhaps the logout button was clicked before the handler was setup?"
+            message = "Clicked logout button but waiting for 'Log in or Registration' button failed, perhaps the logout button was clicked before the handler was setup?"
             raise self.prepend_timeout_message(e, message)
         assert (
             not self.is_logged_in()
diff --git a/lib/galaxy/tools/parameters/validation.py b/lib/galaxy/tools/parameters/validation.py
index 5fe74374102..f78dffdb5f3 100644
--- a/lib/galaxy/tools/parameters/validation.py
+++ b/lib/galaxy/tools/parameters/validation.py
@@ -5,7 +5,8 @@ import abc
 import json
 import logging
 import os.path
-import re
+
+import regex
 
 from galaxy import (
     model,
@@ -144,7 +145,7 @@ class RegexValidator(Validator):
         if not isinstance(value, list):
             value = [value]
         for val in value:
-            match = re.match(self.expression, val or "")
+            match = regex.match(self.expression, val or "")
             super().validate(match is not None, value_to_show=val)
 
 
diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg
index b55aca08848..c8cc845deed 100644
--- a/packages/app/setup.cfg
+++ b/packages/app/setup.cfg
@@ -67,6 +67,7 @@ install_requires =
     PyJWT
     PyYAML
     refgenconf>=0.12.0
+    regex
     requests
     SQLAlchemy>=1.4.25,<2
     sqlitedict
diff --git a/pyproject.toml b/pyproject.toml
index 437951405c6..9829bd1497f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -99,6 +99,7 @@ python-magic = "*"
 python-multipart = "*"  # required to support form parsing in FastAPI/Starlette
 PyYAML = "*"
 refgenconf = ">=0.12.0"
+regex = "*"
 requests = "*"
 rocrate = "*"
 Routes = "*"
diff --git a/test/functional/tools/from_work_dir_glob.xml b/test/functional/tools/from_work_dir_glob.xml
index 0fb29b57e15..dc0bb758516 100644
--- a/test/functional/tools/from_work_dir_glob.xml
+++ b/test/functional/tools/from_work_dir_glob.xml
@@ -13,6 +13,7 @@ echo "hi" > output1.txt
                 <assert_contents>
                     <has_text text="hi" />
                 </assert_contents>
+                <metadata name="data_lines" value="1" />
                 <!-- This does not work with the default __copy_if_exists mechanism
                     <metadata name="created_from_basename" value="output1.txt" />
                 -->
diff --git a/test/functional/tools/job_properties.xml b/test/functional/tools/job_properties.xml
index a7432781e8e..19ee032ab6c 100644
--- a/test/functional/tools/job_properties.xml
+++ b/test/functional/tools/job_properties.xml
@@ -39,7 +39,9 @@
     <tests>
         <test expect_exit_code="0">
             <param name="thebool" value="true" />
-            <output name="out_file1" file="simple_line.txt" />
+            <output name="out_file1" file="simple_line.txt" >
+                <metadata name="data_lines" value="1" />
+            </output>
             <assert_command>
                 <has_text text="really" />
             </assert_command>
diff --git a/test/integration/test_extended_metadata.py b/test/integration/test_extended_metadata.py
index 9459e2ce9e4..11d259bf456 100644
--- a/test/integration/test_extended_metadata.py
+++ b/test/integration/test_extended_metadata.py
@@ -6,6 +6,7 @@ from galaxy_test.base.populators import (
 from galaxy_test.driver import integration_util
 
 TEST_TOOL_IDS = [
+    "from_work_dir_glob",
     "job_properties",
     "multi_output",
     "multi_output_configured",
diff --git a/test/unit/app/tools/test_parameter_validation.py b/test/unit/app/tools/test_parameter_validation.py
index 77fcfee7030..a1f9da021b4 100644
--- a/test/unit/app/tools/test_parameter_validation.py
+++ b/test/unit/app/tools/test_parameter_validation.py
@@ -62,3 +62,15 @@ class TestParameterValidation(BaseParameterTestCase):
             ValueError, r"Validator 'value.lower\(\) == \"foo\"' could not be evaluated on '1'"
         ):
             p.validate(1)
+
+    def test_RegexValidator_global_flag_inline(self):
+        # tests that global inline flags continue to work past python 3.10
+        p = self._parameter_for(
+            xml=r"""
+<param name="blah" type="text" value="">
+    <validator type="regex">^(?ims)\s*select\s+.*\s+from\s+.*$</validator>
+</param>"""
+        )
+        p.validate("select id from job where id = 1;")
+        with self.assertRaises(ValueError):
+            p.validate("not sql")