diff --git a/client/src/components/Form/Elements/FormSelection.vue b/client/src/components/Form/Elements/FormSelection.vue
index ca328723e6b0..2b533461c338 100644
--- a/client/src/components/Form/Elements/FormSelection.vue
+++ b/client/src/components/Form/Elements/FormSelection.vue
@@ -96,14 +96,12 @@ watch(
     { immediate: true }
 );
 
-const displayMany = computed(
-    () => props.multiple && props.display !== "checkboxes" && props.display !== "radio" && useMany.value
-);
-
-const showManyButton = computed(
-    () => props.multiple && props.display !== "checkboxes" && props.display !== "radio" && !useMany.value
+const showSelectPreference = computed(
+    () => props.multiple && props.display !== "checkboxes" && props.display !== "radio"
 );
 
+const displayMany = computed(() => showSelectPreference.value && useMany.value);
+const showManyButton = computed(() => showSelectPreference.value && !useMany.value);
 const showMultiButton = computed(() => displayMany.value);
 </script>
 
@@ -114,7 +112,7 @@ const showMultiButton = computed(() => displayMany.value);
         <FormSelectMany v-else-if="displayMany" v-model="currentValue" :options="currentOptions" />
         <FormSelect v-else v-model="currentValue" :multiple="multiple" :optional="optional" :options="currentOptions" />
 
-        <div class="d-flex">
+        <div v-if="showSelectPreference" class="d-flex">
             <button v-if="showManyButton" class="ui-link ml-1" @click="useMany = true">switch to column select</button>
             <button v-else-if="showMultiButton" class="ui-link ml-1" @click="useMany = false">
                 switch to simple select
diff --git a/client/src/components/History/CurrentCollection/CollectionOperations.vue b/client/src/components/History/CurrentCollection/CollectionOperations.vue
index 45afab8d4ea4..2843caddf801 100644
--- a/client/src/components/History/CurrentCollection/CollectionOperations.vue
+++ b/client/src/components/History/CurrentCollection/CollectionOperations.vue
@@ -1,3 +1,27 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { useRouter } from "vue-router/composables";
+
+import { HDCADetailed } from "@/api";
+import { getAppRoot } from "@/onload/loadConfig";
+
+const router = useRouter();
+
+const props = defineProps<{
+    dsc: HDCADetailed;
+}>();
+
+const downloadUrl = computed(() => `${getAppRoot()}api/dataset_collections/${props.dsc.id}/download`);
+const rerunUrl = computed(() =>
+    props.dsc.job_source_type == "Job" ? `/root?job_id=${props.dsc.job_source_id}` : null
+);
+const showCollectionDetailsUrl = computed(() =>
+    props.dsc.job_source_type == "Job" ? `/jobs/${props.dsc.job_source_id}/view` : null
+);
+function onDownload() {
+    window.location.href = downloadUrl.value;
+}
+</script>
 <template>
     <section>
         <nav class="content-operations d-flex justify-content-between bg-secondary">
@@ -12,26 +36,29 @@
                     <Icon class="mr-1" icon="download" />
                     <span>Download</span>
                 </b-button>
+                <b-button
+                    v-if="showCollectionDetailsUrl"
+                    class="collection-job-details-btn px-1"
+                    title="Show Details"
+                    size="sm"
+                    variant="link"
+                    :href="showCollectionDetailsUrl"
+                    @click.prevent.stop="router.push(showCollectionDetailsUrl)">
+                    <icon icon="info-circle" />
+                    <span>Show Details</span>
+                </b-button>
+                <b-button
+                    v-if="rerunUrl"
+                    title="Rerun job"
+                    class="rounded-0 text-decoration-none"
+                    size="sm"
+                    variant="link"
+                    :href="rerunUrl"
+                    @click.prevent.stop="router.push(rerunUrl)">
+                    <Icon class="mr-1" icon="redo" />
+                    <span>Run Job Again</span>
+                </b-button>
             </b-button-group>
         </nav>
     </section>
 </template>
-
-<script>
-export default {
-    props: {
-        dsc: { type: Object, required: true },
-    },
-    computed: {
-        /** @return {String} */
-        downloadUrl() {
-            return `${this.dsc.url}/download`;
-        },
-    },
-    methods: {
-        onDownload() {
-            window.location.href = this.downloadUrl;
-        },
-    },
-};
-</script>
diff --git a/config/job_metrics_conf.xml.sample b/config/job_metrics_conf.xml.sample
deleted file mode 120000
index a5e81247f4c9..000000000000
--- a/config/job_metrics_conf.xml.sample
+++ /dev/null
@@ -1 +0,0 @@
-../lib/galaxy/config/sample/job_metrics_conf.xml.sample
\ No newline at end of file
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 38fe6334a007..7ee4d6243cd8 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -4289,7 +4289,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :Description:
-    XML config file that contains the job metric collection
+    YAML or XML config file that contains the job metric collection
     configuration.
     The value of this option will be resolved with respect to
     <config_dir>.
@@ -4297,6 +4297,24 @@
 :Type: str
 
 
+~~~~~~~~~~~~~~~
+``job_metrics``
+~~~~~~~~~~~~~~~
+
+:Description:
+    Rather than specifying a job_metrics_config_file, the definition
+    of the metrics to enable can be embedded into Galaxy's config with
+    this option. This has no effect if a job_metrics_config_file is
+    used.
+    The syntax, available instrumenters, and documentation of their
+    options is explained in detail in the documentation:
+    https://docs.galaxyproject.org/en/master/admin/job_metrics.html
+    By default, the core plugin is enabled. Setting this option to
+    false or an empty list disables metrics entirely.
+:Default: ``None``
+:Type: seq
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``expose_potentially_sensitive_job_metrics``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index c213a16e53d6..2ae8d1af72a0 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -17,6 +17,7 @@ This documentation is in the midst of being ported and unified based on resource
    scaling
    cluster
    jobs
+   job_metrics
    authentication
    tool_panel
    mq
diff --git a/doc/source/admin/job_metrics.rst b/doc/source/admin/job_metrics.rst
new file mode 100644
index 000000000000..aacbec1d304a
--- /dev/null
+++ b/doc/source/admin/job_metrics.rst
@@ -0,0 +1,171 @@
+.. _job_metrics:
+
+
+Collecting Job Metrics
+======================
+
+Galaxy can collect various metrics about jobs that it runs. The metrics that can be collected depend on which plugins
+(described in this section) are enabled. Two ``galaxy.yml`` configuration options control the job metrics plugin
+configuration:
+
+1. ``job_metrics``: Inline global configuration of job metrics plugins
+2. ``job_metrics_config_file``: Path to a standalone metrics configuration file. Prior to Galaxy 23.2, this was the only
+   way to configure job metrics plugins. It defaults to ``<config_dir>/job_metrics_conf.xml`` for legacy reasons, but
+   using the XML syntax is discouraged, YAML (the syntax is the same as ``job_metrics``) is preferred.
+
+If the ``job_metrics_config_file`` exists, it overrides anything configured in ``job_metrics``.
+
+Default Job Metrics Configuration
+---------------------------------
+
+If no configuration is specified, the default is to load only the ``core`` plugin:
+
+.. code-block:: yaml
+
+  - type: core
+
+Available Job Metrics Plugins
+-----------------------------
+
+The list of metrics plugins implemented in the code can be found at ``lib/galaxy/job_metrics/instrumenters``.
+
+
+core
+~~~~
+
+The core plugin captures the number of cores allocated to the job (``$GALAXY_SLOTS``), the start and end time of job (in
+seconds since epoch) and computes the runtime in seconds.
+
+It has no options.
+
+.. code-block:: yaml
+
+    - type: core
+
+cpuinfo
+~~~~~~~
+
+The cpuinfo plugin captures the processor count on the system that that job ran on (note that this may differ from the
+number of CPUs actually allocated to the job).
+
+The optional ``verbose`` option (default: ``false``) captures details (likely far too much) about each CPU, as found in
+``/proc/cpuinfo``.
+
+The cpuinfo plugin works on Linux only.
+
+.. code-block:: yaml
+
+    - type: cpuinfo
+      verbose: false
+
+meminfo
+~~~~~~~
+
+The meminfo plugin captures the memory information on the system that the job ran on (note that this may differ from the
+amount of memory actually allocated to the job).
+
+It has no options.
+
+.. code-block:: yaml
+
+    - type: meminfo
+
+hostname
+~~~~~~~~
+
+The hostname plugin captures the output of ``hostname`` on the system that the job ran on.
+
+It has no options.
+
+.. code-block:: yaml
+
+    - type: hostname
+
+uname
+~~~~~
+
+The uname plugin captures the output of ``uname -a`` on the system that the job ran on.
+
+It has no options.
+
+.. code-block:: yaml
+
+    - type: uname
+
+env
+~~~
+
+The env plugin captures environment variables set in the job's executing environment.
+
+By default, it captures **all** environment variables, which is likely excessive but may be useful for debugging. The
+optional ``variables`` option can be set to a list of variables to capture (if set). For legacy purposes, this can also
+be a comma-separated string of variable names.
+
+.. code-block:: yaml
+
+    - type: env
+      variables:
+        - HOSTNAME
+        - SLURM_CPUS_ON_NODE
+        - SLURM_JOBID
+
+cgroup
+~~~~~~
+
+The cgroup plugin captures values set by `Linux Control Groups (cgroups)
+<https://docs.kernel.org/admin-guide/cgroup-v2.html>`_. This is most useful if your jobs run in unique per-job Cgroups
+(as Slurm does `if so configured <https://slurm.schedmd.com/cgroups.html>`_).
+
+Both cgroups version 1 (cgroupsv1) and cgroups version 2 (cgroupsv2) are supported, by default metrics will be collected
+for whichever version is mounted on the system where the job ran. The optional ``version`` option (default: ``auto``)
+can be used to only generate metrics capture commands in the job script for the specified cgroups version (``1`` or
+``2``).
+
+By default, only a small set of cgroup parameters will be recorded, the list of which can be found in
+``lib/galaxy/job_metrics/instrumenters/cgroup.py`` in the Galaxy code. The optional ``verbose`` option (default:
+``false``) can be set to capture all parameters in the ``cpu``, ``cpuacct``, and ``memory`` controllers (cgroups version
+1) or ``cpu`` and ``memory`` controllers (cgroups version 2).
+
+It is also possible to specify exactly which cgroup parameters to capture by setting the optional ``params`` option to a
+list of parameter names (files in the controller directory) to capture. For legacy purposes, this can also be a
+comma-separated string of cgroup parameter names.
+
+The cgroup plugin works on Linux only.
+
+.. code-block:: yaml
+
+    - type: cgroup
+      verbose: false
+      version: 2
+      params:
+        - cpu.stat
+        - memory.peak
+
+Overriding the Global Job Metrics Configuration
+-----------------------------------------------
+
+Individual Galaxy job config environments (destinations) can disable metric collection by setting the ``metrics`` parameter on that environment:
+
+
+.. code-block:: yaml
+
+   execution:
+     environments:
+       example:
+         metrics:
+           - type: core
+           - type: cpuinfo
+           - type: meminfo
+
+Alternatively, a file can be specified:
+
+.. code-block:: yaml
+
+   execution:
+     environments:
+       example:
+         metrics:
+          src: path
+          path: /srv/galaxy/config/metrics_override.yml
+
+Additional accepted values for ``src`` include ``default`` and ``disabled``.
diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index 2753b87a076e..affa3ea7c854 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -521,7 +521,7 @@ def __init__(self, configure_logging=True, use_converters=True, use_display_appl
         # Initialize job metrics manager, needs to be in place before
         # config so per-destination modifications can be made.
         self.job_metrics = self._register_singleton(
-            JobMetrics, JobMetrics(self.config.job_metrics_config_file, app=self)
+            JobMetrics, JobMetrics(self.config.job_metrics_config_file, self.config.job_metrics, app=self)
         )
         # Initialize the job management configuration
         self.job_config = self._register_singleton(jobs.JobConfiguration)
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index fd0b5aa9c538..18c920b92695 100644
--- a/lib/galaxy/config/__init__.py
+++ b/lib/galaxy/config/__init__.py
@@ -684,7 +684,6 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
     add_sample_file_to_defaults = {
         "build_sites_config_file",
         "datatypes_config_file",
-        "job_metrics_config_file",
         "tool_data_table_config_path",
         "tool_config_file",
     }
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 2bdbe0956431..8d1149c1e445 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -2325,12 +2325,22 @@ galaxy:
   # with Galaxy there you can enable this option.
   #enable_tool_source_display: false
 
-  # XML config file that contains the job metric collection
+  # YAML or XML config file that contains the job metric collection
   # configuration.
   # The value of this option will be resolved with respect to
   # <config_dir>.
   #job_metrics_config_file: job_metrics_conf.xml
 
+  # Rather than specifying a job_metrics_config_file, the definition of
+  # the metrics to enable can be embedded into Galaxy's config with this
+  # option. This has no effect if a job_metrics_config_file is used.
+  # The syntax, available instrumenters, and documentation of their
+  # options is explained in detail in the documentation:
+  # https://docs.galaxyproject.org/en/master/admin/job_metrics.html
+  # By default, the core plugin is enabled. Setting this option to false
+  # or an empty list disables metrics entirely.
+  #job_metrics: null
+
   # This option allows users to see the job metrics (except for
   # environment variables).
   #expose_potentially_sensitive_job_metrics: false
diff --git a/lib/galaxy/config/sample/job_metrics_conf.xml.sample b/lib/galaxy/config/sample/job_metrics_conf.xml.sample
deleted file mode 100644
index 1c9c70274e53..000000000000
--- a/lib/galaxy/config/sample/job_metrics_conf.xml.sample
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<!-- If job_metrics.xml exists, this file will define the default job metric
-     plugin used for all jobs. Individual job_conf.xml destinations can
-     disable metric collection by setting metrics="off" on that destination.
-     The metrics attribute on destination definition elements can also be
-     a path - in which case that XML metrics file will be loaded and used for
-     that destination. Finally, the destination element may contain a job_metrics
-     child element (with all options defined below) to define job metrics in an
-     embedded manner directly in the job_conf.xml file.
--->
-<job_metrics>
-  <!-- Each element in this file corresponds to a job instrumentation plugin
-       used to generate metrics in lib/galaxy/jobs/metrics/instrumenters. -->
-
-  <!-- Core plugin captures Galaxy slots, start and end of job (in seconds
-       since epoch) and computes runtime in seconds. -->
-  <core />
-
-  <!-- Uncomment to dump processor count for each job - linux only. -->
-  <!-- <cpuinfo /> -->
-  <!-- Uncomment to dump information about all processors for for each
-       job - this is likely too much data. Linux only. -->
-  <!-- <cpuinfo verbose="true" /> -->
-
-  <!-- Uncomment to dump system memory information for each job - linux
-       only. -->
-  <!-- <meminfo /> -->
-
-  <!-- Uncomment to record operating system each job is executed on - linux
-       only. -->
-  <!-- <uname /> -->
-
-  <!-- Uncomment following to enable plugin dumping complete environment
-       for each job, potentially useful for debuging -->
-  <!-- <env /> -->
-  <!-- env plugin can also record more targetted, obviously useful variables
-       as well. -->
-  <!-- <env variables="HOSTNAME,SLURM_CPUS_ON_NODE,SLURM_JOBID" /> -->
-
-  <!-- If galaxy jobs are run in cgroups, like slurm does if memory limits
-       are enforced, we can try to grep some information from this. By default,
-       only a small set of cgroup parameters will be recorded, the list of which
-       can be found in lib/galaxy/jobs/metrics/instrumenters/cgroup.py.  -->
-  <!-- <cgroup /> -->
-  <!-- All params from the `cpuacct,cpu` and `memory` controllers can be
-       recorded.  -->
-  <!-- <cgroup verbose="true" /> -->
-  <!-- Or, specific params can be recorded. -->
-  <!-- <cgroup params="cpuacct.usage,memory.max_usage_in_bytes,memory.memsw.max_usage_in_bytes" /> -->
-
-  <!-- Uncomment to record hostname - *nix only -->
-  <!-- <hostname /> -->
-
-  <!-- <collectl /> -->
-  <!-- Collectl (http://collectl.sourceforge.net/) is a powerful monitoring
-       utility capable of gathering numerous system and process level
-       statistics of running applications. The Galaxy collectl job metrics
-       plugin by default will grab a variety of process level metrics
-       aggregated across all processes corresponding to a job, this behavior
-       is highly customiziable - both using the attributes documented below
-       or simply hacking up the code in lib/galaxy/jobs/metrics.
-
-       Warning: In order to use this plugin collectl must be available on the
-       compute server the job runs on and on the local Galaxy server as well
-       (unless in this latter case summarize_process_data is set to False).
-
-       Attributes (the follow describes attributes that can be used with
-       the collectl job metrics element above to modify its behavior).
-
-       'summarize_process_data': Boolean indicating whether to run collectl
-              in playback mode after jobs complete and gather process level
-              statistics for the job run. These statistics can be customized
-              with the 'process_statistics' attribute. (defaults to True)
-
-       'saved_logs_path': If set (it is off by default), all collectl logs
-              will be saved to the specified path after jobs complete. These
-              logs can later be replayed using collectl offline to generate
-              full time-series data corresponding to a job run.
-
-       'subsystems': Comma separated list of collectl subystems to collect
-              data for. Plugin doesn't currently expose all of them or offer
-              summary data for any of them except 'process' but extensions
-              would be welcome. May seem pointless to include subsystems
-              beside process since they won't be processed online by Galaxy -
-              but if 'saved_logs_path' these files can be played back at anytime.
-
-              Available subsystems - 'process', 'cpu', 'memory', 'network',
-              'disk', 'network'. (Default 'process').
-
-              Warning: If you override this - be sure to include 'process'
-              unless 'summarize_process_data' is set to false.
-
-       'process_statistics': If 'summarize_process_data' this attribute can be
-              specified as a comma separated list to override the statistics
-              that are gathered. Each statistics is of the for X_Y where X
-              if one of 'min', 'max', 'count', 'avg', or 'sum' and Y is a
-              value from 'S', 'VmSize', 'VmLck', 'VmRSS', 'VmData', 'VmStk',
-              'VmExe', 'VmLib', 'CPU', 'SysT', 'UsrT', 'PCT', 'AccumT' 'WKB',
-              'RKBC', 'WKBC', 'RSYS', 'WSYS', 'CNCL', 'MajF', 'MinF'. Consult
-              lib/galaxy/jobs/metrics/collectl/processes.py for more details
-              on what each of these resource types means.
-
-              Defaults to 'max_VmSize,avg_VmSize,max_VmRSS,avg_VmRSS,sum_SysT,sum_UsrT,max_PCT avg_PCT,max_AccumT,sum_RSYS,sum_WSYS'
-              as variety of statistics roughly describing CPU and memory
-              usage of the program and VERY ROUGHLY describing I/O consumption.
-
-       'procfilt_on': By default Galaxy will tell collectl to only collect
-             'process' level data for the current user (as identified)
-             by 'username' (default) - this can be disabled by settting this
-             to 'none' - the plugin will still only aggregate process level
-             statistics for the jobs process tree - but the additional
-             information can still be used offline with 'saved_logs_path'
-             if set. Obsecurely, this can also be set 'uid' to identify
-             the current user to filter on by UID instead of username -
-             this may needed on some clusters(?).
-
-       'interval': The time (in seconds) between data collection points.
-              Collectl uses a variety of different defaults for different
-              subsystems if this is not set, but process information (likely
-              the most pertinent for Galaxy jobs will collect data every
-              60 seconds).
-
-       'flush': Interval (in seconds I think) between when collectl will
-              flush its buffer to disk. Galaxy overrides this to disable
-              flushing by default if not set.
-
-       'local_collectl_path', 'remote_collectl_path', 'collectl_path':
-              By default, jobs will just assume collectl is on the PATH, but
-              it can be overridden with 'local_collectl_path' and
-              'remote_collectl_path' (or simply 'collectl_path' if it is not
-              on the path but installed in the same location both locally and
-              remotely).
-
-        There are more and more increasingly obsecure options including -
-        log_collectl_program_output, interval2, and interval3. Consult
-        source code for more details.
-  -->
-</job_metrics>
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index f63112d8a2f1..52456679891c 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -3129,7 +3129,24 @@ mapping:
         path_resolves_to: config_dir
         required: false
         desc: |
-          XML config file that contains the job metric collection configuration.
+          YAML or XML config file that contains the job metric collection configuration.
+
+      job_metrics:
+        type: seq
+        sequence:
+          - type: any
+        desc: |
+          Rather than specifying a job_metrics_config_file, the definition of the
+          metrics to enable can be embedded into Galaxy's config with this option.
+          This has no effect if a job_metrics_config_file is used.
+
+          The syntax, available instrumenters, and documentation of their options is explained in detail in the
+          documentation:
+
+          https://docs.galaxyproject.org/en/master/admin/job_metrics.html
+
+          By default, the core plugin is enabled. Setting this option to false or an empty list disables metrics
+          entirely.
 
       expose_potentially_sensitive_job_metrics:
         type: bool
diff --git a/lib/galaxy/job_metrics/__init__.py b/lib/galaxy/job_metrics/__init__.py
index 8fdb85f75a2e..2b1c5399bd20 100644
--- a/lib/galaxy/job_metrics/__init__.py
+++ b/lib/galaxy/job_metrics/__init__.py
@@ -37,6 +37,7 @@
 
 
 DEFAULT_FORMATTER = formatting.JobMetricFormatter()
+DEFAULT_CONFIG = [{"type": "core"}]
 
 
 class DictifiableMetric(NamedTuple):
@@ -68,10 +69,18 @@ class RawMetric(NamedTuple):
 class JobMetrics:
     """Load and store a collection of :class:`JobInstrumenter` objects."""
 
-    def __init__(self, conf_file=None, **kwargs):
+    def __init__(self, conf_file=None, conf_dict=None, **kwargs):
         """Load :class:`JobInstrumenter` objects from specified configuration file."""
         self.plugin_classes = self.__plugins_dict()
-        self.default_job_instrumenter = JobInstrumenter.from_file(self.plugin_classes, conf_file, **kwargs)
+        if conf_file and os.path.exists(conf_file):
+            self.default_job_instrumenter = JobInstrumenter.from_file(self.plugin_classes, conf_file, **kwargs)
+        elif conf_dict or conf_dict is None:
+            if conf_dict is None:
+                conf_dict = DEFAULT_CONFIG
+            self.default_job_instrumenter = JobInstrumenter.from_dict(self.plugin_classes, conf_dict, **kwargs)
+        else:
+            # allows for setting non-None falsey values to get no metrics config whatsoever
+            self.default_job_instrumenter = NULL_JOB_INSTRUMENTER
         self.job_instrumenters = collections.defaultdict(lambda: self.default_job_instrumenter)
 
     def format(self, plugin: str, key: str, value: Any) -> formatting.FormattedMetric:
@@ -227,6 +236,11 @@ def from_file(plugin_classes, conf_file, **kwargs) -> "JobInstrumenterI":
         plugins_source = plugin_config.plugin_source_from_path(conf_file)
         return JobInstrumenter(plugin_classes, plugins_source, **kwargs)
 
+    @staticmethod
+    def from_dict(plugin_classes, conf_dict, **kwargs) -> "JobInstrumenterI":
+        plugin_source = plugin_config.plugin_source_from_dict(conf_dict)
+        return JobInstrumenter(plugin_classes, plugin_source, **kwargs)
+
 
 __all__ = (
     "JobInstrumenter",
diff --git a/lib/galaxy/job_metrics/instrumenters/cgroup.py b/lib/galaxy/job_metrics/instrumenters/cgroup.py
index d47390190320..8ad6b11870c3 100644
--- a/lib/galaxy/job_metrics/instrumenters/cgroup.py
+++ b/lib/galaxy/job_metrics/instrumenters/cgroup.py
@@ -91,7 +91,9 @@ def __init__(self, **kwargs):
         self.verbose = asbool(kwargs.get("verbose", False))
         self.cgroup_mount = kwargs.get("cgroup_mount", "/sys/fs/cgroup")
         params_str = kwargs.get("params", None)
-        if params_str:
+        if isinstance(params_str, list):
+            params = params_str
+        elif params_str:
             params = [v.strip() for v in params_str.split(",")]
         else:
             params = list(TITLES.keys())
diff --git a/lib/galaxy/job_metrics/instrumenters/env.py b/lib/galaxy/job_metrics/instrumenters/env.py
index fd28e89b9e5b..d08b5c90a784 100644
--- a/lib/galaxy/job_metrics/instrumenters/env.py
+++ b/lib/galaxy/job_metrics/instrumenters/env.py
@@ -29,7 +29,9 @@ class EnvPlugin(InstrumentPlugin):
 
     def __init__(self, **kwargs):
         variables_str = kwargs.get("variables", None)
-        if variables_str:
+        if isinstance(variables_str, list):
+            self.variables = variables_str
+        elif variables_str:
             self.variables = [v.strip() for v in variables_str.split(",")]
         else:
             self.variables = None
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index d7164a1bae7a..8bbc703056b0 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -244,7 +244,7 @@ def name_filter(term):
                             term,
                         )
                     )
-        stmt = stmt.where(StoredWorkflow.deleted == (true() if show_deleted else false()))
+        stmt = stmt.where(StoredWorkflow.deleted == (true() if show_deleted else false())).distinct()
         if include_total_count:
             total_matches = get_count(trans.sa_session, stmt)
         else:
diff --git a/lib/galaxy/schema/jobs.py b/lib/galaxy/schema/jobs.py
index 4ab9241c9e4c..37cd7af3d41f 100644
--- a/lib/galaxy/schema/jobs.py
+++ b/lib/galaxy/schema/jobs.py
@@ -198,6 +198,9 @@ class JobDestinationParams(Model):
         None, title="Handler", description="Name of the process that handled the job.", alias="Handler"
     )
 
+    class Config:
+        extra = Extra.allow  # JobDestinationParams can have extra fields
+
 
 class JobOutput(Model):
     label: Any = Field(default=Required, title="Output label", description="The output label")  # check if this is true
diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 73c4064e4055..aa0d83b3c9e5 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -729,6 +729,33 @@ def test_index_parameter_invalid_combinations(self):
         self._assert_status_code_is(response, 400)
         self._assert_error_code_is(response, error_codes.error_codes_by_name["USER_REQUEST_INVALID_PARAMETER"])
 
+    def test_index_total_matches(self):
+        with self._different_user("isolated.wf.user@test.email"):
+            my_workflow_id = self.workflow_populator.simple_workflow("mine_1")
+            self.workflow_populator.simple_workflow("mine_2")
+            my_email = self.dataset_populator.user_email()
+            with self._different_user():
+                their_shared_workflow_id = self.workflow_populator.simple_workflow("theirs_1")
+                self.workflow_populator.share_with_user(their_shared_workflow_id, my_email)
+                their_workflow_to_import_id = self.workflow_populator.simple_workflow("theirs_2", publish=True)
+                self.workflow_populator.set_tags(their_workflow_to_import_id, ["theirs_2", "test"])
+
+            import_response = self.__import_workflow(their_workflow_to_import_id)
+            self._assert_status_code_is(import_response, 200)
+            imported_wf_id = import_response.json()["id"]
+
+            # add tags to my workflows
+            self.workflow_populator.set_tags(my_workflow_id, ["mine_1", "test"])
+            self.workflow_populator.set_tags(imported_wf_id, ["imported", "test"])
+
+            # We should have 4 workflows now (2 mine, 1 shared with me, 1 imported)
+            expected_number_of_workflows = 4
+            workflows_response = self._get("workflows")
+            self._assert_status_code_is(workflows_response, 200)
+            assert workflows_response.headers["Total_matches"] == f"{expected_number_of_workflows}"
+            workflows = workflows_response.json()
+            assert len(workflows) == expected_number_of_workflows
+
     def test_upload(self):
         self.__test_upload(use_deprecated_route=False)