diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5da1bca335..d7e557b6896 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,6 +93,15 @@ jobs:
       - run: sudo apt-get install -y libxml2-utils
       - *install_tox
       - run: tox -e validate_test_tools
+  test_galaxy_release:
+    docker:
+      - image: circleci/python:3.6
+    <<: *set_workdir
+    steps:
+      - *restore_repo_cache
+      - *install_tox
+      - *install_ffprobe
+      - run: tox -e test_galaxy_release
   test_galaxy_packages:
     docker:
       - image: circleci/python:3.6
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index 9b4489e4302..4902a94a3a9 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -1,7 +1,7 @@
 name: API tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/api_paste.yaml b/.github/workflows/api_paste.yaml
index 1f34a6b6840..1f4bc2bc2f7 100644
--- a/.github/workflows/api_paste.yaml
+++ b/.github/workflows/api_paste.yaml
@@ -1,7 +1,7 @@
 name: API (legacy paste) tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_USE_UVICORN: false
 jobs:
   test:
@@ -12,7 +12,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/db_indexes.yaml b/.github/workflows/db_indexes.yaml
index df9b8573260..b11d21bf025 100644
--- a/.github/workflows/db_indexes.yaml
+++ b/.github/workflows/db_indexes.yaml
@@ -13,7 +13,7 @@ jobs:
         db: ['postgresql', 'sqlite']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -38,7 +38,7 @@ jobs:
     - name: Check indexes on postgresql
       if: matrix.db == 'postgresql'
       env:
-        GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+        GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
       run: tox -e check_indexes
     - name: Check indexes on sqlite
       if: matrix.db == 'sqlite'
diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml
index 1930e505595..38399d42ca3 100644
--- a/.github/workflows/dependencies.yaml
+++ b/.github/workflows/dependencies.yaml
@@ -27,9 +27,11 @@ jobs:
       - name: Create pull request
         uses: peter-evans/create-pull-request@v3
         with:
+          token: ${{ secrets.GALAXYBOT_PAT }}
           commit-message: Update Python dependencies
-          title: Update Python dependencies
-          body: Run `make update-dependencies`.
           branch: dev_auto_update_dependencies
           delete-branch: true
+          push-to-fork: galaxybot/galaxy
+          title: Update Python dependencies
+          body: Run `make update-dependencies`.
           labels: area/dependencies
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index f4445f16948..36b2c3fe34b 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -50,7 +50,6 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
-          pip install awscli
           case "$TARGET_BRANCH" in
               release_[[:digit:]][[:digit:]].[[:digit:]][[:digit:]]|master)
                   UPLOAD_DIR=$TARGET_BRANCH
@@ -63,4 +62,5 @@ jobs:
                   exit 0
                   ;;
           esac
+          pip install awscli
           aws s3 sync doc/build/html/ "s3://galaxy-docs/en/$UPLOAD_DIR" --region us-east-2 --size-only --delete
diff --git a/.github/workflows/framework.yaml b/.github/workflows/framework.yaml
index 55aa99f6219..280f90a7bdf 100644
--- a/.github/workflows/framework.yaml
+++ b/.github/workflows/framework.yaml
@@ -1,7 +1,7 @@
 name: Framework tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 9d4d64e7718..9366868b379 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -1,7 +1,7 @@
 name: Integration
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
 jobs:
   test:
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 0bfe9859ea4..4d0e3b1d706 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -1,7 +1,7 @@
 name: Integration Selenium
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_SELENIUM_REMOTE: '1'
   GALAXY_TEST_SELENIUM_REMOTE_PORT: "4444"
   GALAXY_SKIP_CLIENT_BUILD: '0'
@@ -15,7 +15,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index 2d045fdced1..dd23da13e7e 100644
--- a/.github/workflows/performance.yaml
+++ b/.github/workflows/performance.yaml
@@ -1,7 +1,7 @@
 name: Performance tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index a6bb3ed340f..27464bf9d50 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -1,7 +1,7 @@
 name: Selenium tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
   GALAXY_TEST_SELENIUM_RETRIES: 1
 jobs:
@@ -15,7 +15,7 @@ jobs:
         chunk: [0, 1, 2]
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
index 5d260077cc3..0d88af5866e 100644
--- a/.github/workflows/toolshed.yaml
+++ b/.github/workflows/toolshed.yaml
@@ -1,8 +1,8 @@
 name: Toolshed tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
-  TOOL_SHED_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  TOOL_SHED_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
 jobs:
   test:
     name: Test
@@ -12,7 +12,7 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:11
+        image: postgres:13
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/Makefile b/Makefile
index 0cc62b722cf..eecec849d45 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,8 @@
 VENV?=.venv
 # Source virtualenv to execute command (flake8, sphinx, twine, etc...)
 IN_VENV=if [ -f "$(VENV)/bin/activate" ]; then . "$(VENV)/bin/activate"; fi;
-RELEASE_CURR:=16.01
-RELEASE_CURR_MINOR_NEXT:=$(shell $(IN_VENV) python scripts/bootstrap_history.py --print-next-minor-version)
-RELEASE_NEXT:=16.04
-# TODO: This needs to be updated with create_release_rc
-#RELEASE_NEXT_BRANCH:=release_$(RELEASE_NEXT)
-RELEASE_NEXT_BRANCH:=dev
+RELEASE_CURR:=21.05
 RELEASE_UPSTREAM:=upstream
-MY_UPSTREAM:=origin
 CONFIG_MANAGE=$(IN_VENV) python lib/galaxy/config/config_manage.py
 PROJECT_URL?=https://github.com/galaxyproject/galaxy
 DOCS_DIR=doc
@@ -180,97 +174,13 @@ serve-selenium-notebooks: ## Serve testing notebooks for Jupyter
 	cd lib && export PYTHONPATH=`pwd`; jupyter notebook --notebook-dir=galaxy_test/selenium/jupyter
 
 # Release Targets
-release-create-rc: release-ensure-upstream ## Create a release-candidate branch
-	git checkout dev
-	git pull --ff-only $(RELEASE_UPSTREAM) dev
-	git push $(MY_UPSTREAM) dev
-	git checkout -b release_$(RELEASE_CURR)
-	git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
-	git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
-	git checkout -b version-$(RELEASE_CURR)
-	sed -i.bak -e "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_CURR)\"/" lib/galaxy/version.py
-	sed -i.bak -e "s/^VERSION_MINOR = .*/VERSION_MINOR = \"rc1\"/" lib/galaxy/version.py
-	rm -f lib/galaxy/version.py.bak
-	git add lib/galaxy/version.py
-	git commit -m "Update version to $(RELEASE_CURR).rc1"
-	git checkout dev
+release-create-rc: ## Create a release-candidate branch or new release-candidate version
+	$(IN_VENV) ./scripts/release.sh -c
 
-	git checkout -b version-$(RELEASE_NEXT).dev
-	sed -i.bak -e "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_NEXT)\"/" lib/galaxy/version.py
-	rm -f lib/galaxy/version.py.bak
-	git add lib/galaxy/version.py
-	git commit -m "Update version to $(RELEASE_NEXT).dev"
+release-create: ## Create a release branch
+	$(IN_VENV) ./scripts/release.sh
 
-	-git merge version-$(RELEASE_CURR)
-	git checkout --ours lib/galaxy/version.py
-	git add lib/galaxy/version.py
-	git commit -m "Merge branch 'version-$(RELEASE_CURR)' into version-$(RELEASE_NEXT).dev"
-	git push $(MY_UPSTREAM) version-$(RELEASE_CURR):version-$(RELEASE_CURR)
-	git push $(MY_UPSTREAM) version-$(RELEASE_NEXT).dev:version-$(RELEASE_NEXT).dev
-	git checkout dev
-	# TODO: Use hub to automate these PR creations or push directly.
-	@echo "Open a PR from version-$(RELEASE_CURR) of your fork to release_$(RELEASE_CURR)"
-	@echo "Open a PR from version-$(RELEASE_NEXT).dev of your fork to dev"
-
-release-create: release-ensure-upstream ## Create a release branch
-	git checkout master
-	git pull --ff-only $(RELEASE_UPSTREAM) master
-	git push $(MY_UPSTREAM) master
-	git checkout release_$(RELEASE_CURR)
-	git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
-	#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
-	git checkout dev
-	git pull --ff-only $(RELEASE_UPSTREAM) dev
-	#git push $(MY_UPSTREAM) dev
-	# Test run of merging. If there are conflicts, it will fail here.
-	git merge release_$(RELEASE_CURR)
-	git checkout release_$(RELEASE_CURR)
-	sed -i.bak -e "s/^VERSION_MINOR = .*/VERSION_MINOR = None/" lib/galaxy/version.py
-	rm -f lib/galaxy/version.py.bak
-	git add lib/galaxy/version.py
-	git commit -m "Update version to $(RELEASE_CURR)"
-	git tag -m "Tag version $(RELEASE_CURR)" v$(RELEASE_CURR)
-
-	git checkout dev
-	-git merge release_$(RELEASE_CURR)
-	git checkout --ours lib/galaxy/version.py
-	git add lib/galaxy/version.py
-	git commit -m "Merge branch 'release_$(RELEASE_CURR)' into dev"
-	git checkout master
-	git merge release_$(RELEASE_CURR)
-	git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR):release_$(RELEASE_CURR)
-	git push $(RELEASE_UPSTREAM) dev:dev
-	git push $(RELEASE_UPSTREAM) master:master
-	git push $(RELEASE_UPSTREAM) --tags
-
-release-create-point: ## Create a point release
-	git pull --ff-only $(RELEASE_UPSTREAM) master
-	git push $(MY_UPSTREAM) master
-	git checkout release_$(RELEASE_CURR)
-	git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
-	#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
-	git checkout $(RELEASE_NEXT_BRANCH)
-	git pull --ff-only $(RELEASE_UPSTREAM) $(RELEASE_NEXT_BRANCH)
-	#git push $(MY_UPSTREAM) $(RELEASE_NEXT_BRANCH)
-	git merge release_$(RELEASE_CURR)
-	git checkout release_$(RELEASE_CURR)
-	sed -i.bak -e "s/^VERSION_MINOR = .*/VERSION_MINOR = \"$(RELEASE_CURR_MINOR_NEXT)\"/" lib/galaxy/version.py
-	rm -f lib/galaxy/version.py.bak
-	git add lib/galaxy/version.py
-	git commit -m "Update version to $(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)"
-	git tag -m "Tag version $(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)" v$(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)
-	git checkout $(RELEASE_NEXT_BRANCH)
-	-git merge release_$(RELEASE_CURR)
-	git checkout --ours lib/galaxy/version.py
-	git add lib/galaxy/version.py
-	git commit -m "Merge branch 'release_$(RELEASE_CURR)' into $(RELEASE_NEXT_BRANCH)"
-	git checkout master
-	git merge release_$(RELEASE_CURR)
-	#git push origin release_$(RELEASE_CURR):release_$(RELEASE_CURR)
-	#git push origin $(RELEASE_NEXT_BRANCH):release_$(RELEASE_NEXT_BRANCH)
-	#git push origin master:master
-	#git push origin --tags
-	git checkout release_$(RELEASE_CURR)
+release-create-point: release-create ## Create a point release
 
 .PHONY: help
 
diff --git a/client/package.json b/client/package.json
index b2913b43bfa..41d63408093 100644
--- a/client/package.json
+++ b/client/package.json
@@ -77,14 +77,14 @@
     "vue": "^2.6.11",
     "vue-infinite-scroll": "^2.0.2",
     "vue-multiselect": "^2.1.0",
+    "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.3.1",
     "vue-rx": "^6.2.0",
     "vuedraggable": "2.24.1",
     "vueisotope": "^3.1.2",
     "vuex": "^3.4.0",
     "vuex-cache": "^3.2.0",
-    "vuex-persist": "^3.1.3",
-    "vue-observe-visibility": "^1.0.0"
+    "vuex-persist": "^3.1.3"
   },
   "scripts": {
     "watch": "gulp && yarn run save-build-hash && yarn run webpack-watch",
@@ -115,14 +115,14 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.11.0",
     "@babel/preset-env": "^7.11.0",
-    "@testing-library/jest-dom": "^5.11.3",
+    "@testing-library/jest-dom": "^5.11.9",
     "@vue/test-utils": "^1.0.3",
     "amdi18n-loader": "^0.9.3",
     "autoprefixer": "^9.8.0",
     "axios-mock-adapter": "^1.18.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.3.0",
+    "babel-jest": "^26.6.3",
     "babel-loader": "^8.1.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "babel-plugin-transform-vue-template": "^0.4.2",
@@ -131,29 +131,25 @@
     "css-loader": "^3.5.3",
     "del": "^5.1.0",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
-    "eslint": "^7.7.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint": "^7.22.0",
+    "eslint-plugin-vue": "^7.7.0",
     "expose-loader": "^1.0.0",
     "file-loader": "^6.0.0",
     "gulp": "^4.0.2",
     "ignore-loader": "^0.1.2",
     "imports-loader": "^0.8.0",
-    "jest": "^26.4.2",
+    "jest": "^26.6.3",
     "jest-raw-loader": "^1.0.1",
     "json-loader": "^0.5.7",
     "karma": "^5.0.9",
-    "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-phantomjs-launcher": "^1.0.4",
     "karma-polyfill": "^1.1.0",
     "karma-qunit": "^4.1.1",
     "karma-webpack": "^4.0.2",
     "mini-css-extract-plugin": "^0.9.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "phantomjs-polyfill": "0.0.2",
-    "phantomjs-prebuilt": "^2.1.7",
     "postcss-loader": "^3.0.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.2.1",
     "qunit": "^2.10.0",
     "raw-loader": "^4.0.1",
     "sass": "^1.26.5",
diff --git a/client/src/components/Citation/Citations.vue b/client/src/components/Citation/Citations.vue
index 915074d1dc3..b65406d7736 100644
--- a/client/src/components/Citation/Citations.vue
+++ b/client/src/components/Citation/Citations.vue
@@ -24,7 +24,7 @@
                 <Citation
                     class="formatted-reference"
                     :citation="citation"
-                    :outputFormat="outputFormat"
+                    :output-format="outputFormat"
                     v-for="(citation, index) in citations"
                     :key="index"
                 />
@@ -44,7 +44,7 @@
                     <Citation
                         class="formatted-reference"
                         :citation="citation"
-                        :outputFormat="outputFormat"
+                        :output-format="outputFormat"
                         v-for="(citation, index) in citations"
                         :key="index"
                     />
diff --git a/client/src/components/Collections/ListCollectionCreator.vue b/client/src/components/Collections/ListCollectionCreator.vue
index 9687035e75b..4a6d1a99d3d 100644
--- a/client/src/components/Collections/ListCollectionCreator.vue
+++ b/client/src/components/Collections/ListCollectionCreator.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-collection-creator">
-        <div v-if="(state == 'error')">
+        <div v-if="state == 'error'">
             <b-alert show variant="danger">
                 {{ errorText }}
             </b-alert>
@@ -63,10 +63,9 @@
                 </div>
                 <collection-creator
                     :oncancel="oncancel"
-                    :hideSourceItems="hideSourceItems"
+                    :hide-source-items="hideSourceItems"
                     @onUpdateHideSourceItems="onUpdateHideSourceItems"
                     @clicked-create="clickedCreate"
-                    :creationFn="creationFn"
                 >
                     <template v-slot:help-content>
                         <p>
@@ -185,6 +184,7 @@
                                 :key="element.id"
                                 @element-is-selected="elementSelected"
                                 @element-is-discarded="elementDiscarded"
+                                @onRename="(name) => (element.name = name)"
                                 :class="{ selected: getSelectedDatasetElems.includes(element.id) }"
                                 :element="element"
                             />
@@ -236,20 +236,6 @@ export default {
             duplicateNames: [],
         };
     },
-    props: {
-        /** distance from list edge to begin autoscrolling list */
-        autoscrollDist: {
-            type: Number,
-            required: false,
-            default: 24,
-        },
-        /** Color passed to hoverhighlight */
-        highlightClr: {
-            type: String,
-            required: false,
-            default: "rgba( 64, 255, 255, 1.0 )",
-        },
-    },
     computed: {
         atLeastOneDatasetIsSelected() {
             return this.selectedDatasetElems.length > 0;
@@ -301,7 +287,7 @@ export default {
             /** data for list in progress */
             this.workingElements = [];
             // copy initial list, sort, add ids if needed
-            this.workingElements = this.initialElements.slice(0);
+            this.workingElements = JSON.parse(JSON.stringify(this.initialElements.slice(0)));
             this._ensureElementIds();
             this._validateElements();
             this._mangleDuplicateNames();
diff --git a/client/src/components/Collections/ListDatasetCollectionElementView.vue b/client/src/components/Collections/ListDatasetCollectionElementView.vue
index 9e6895d56b7..b9638404b76 100644
--- a/client/src/components/Collections/ListDatasetCollectionElementView.vue
+++ b/client/src/components/Collections/ListDatasetCollectionElementView.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="collection-element" @click="$emit('element-is-selected', element)">
-        <click-to-edit v-model="element.name" :title="titleElementName" />
+        <click-to-edit v-model="elementName" :title="titleElementName" />
         <button class="discard-btn btn-sm" :title="titleDiscardButton" @click="clickDiscard">
             {{ l("Discard") }}
         </button>
@@ -11,6 +11,9 @@
 import _l from "utils/localization";
 import ClickToEdit from "./common/ClickToEdit";
 export default {
+    created: function () {
+        this.elementName = this.element.name;
+    },
     props: {
         element: {
             required: true,
@@ -21,6 +24,7 @@ export default {
             titleDiscardButton: _l("Remove this dataset from the list"),
             titleElementName: _l("Click to rename"),
             isSelected: false,
+            elementName: "",
         };
     },
     components: { ClickToEdit },
@@ -37,6 +41,11 @@ export default {
             return "ListDatasetCollectionElementView()";
         },
     },
+    watch: {
+        elementName() {
+            this.$emit("onRename", this.elementName);
+        },
+    },
 };
 </script>
 
diff --git a/client/src/components/Collections/PairCollectionCreator.vue b/client/src/components/Collections/PairCollectionCreator.vue
index 10b6d81130f..4088a31de1f 100644
--- a/client/src/components/Collections/PairCollectionCreator.vue
+++ b/client/src/components/Collections/PairCollectionCreator.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="pair-collection-creator">
-        <div v-if="(state == 'error')">
+        <div v-if="state == 'error'">
             <b-alert show variant="danger">
                 {{ errorText }}
             </b-alert>
@@ -78,11 +78,11 @@
                 </div>
                 <collection-creator
                     :oncancel="oncancel"
-                    :hideSourceItems="hideSourceItems"
+                    :hide-source-items="hideSourceItems"
                     @onUpdateHideSourceItems="onUpdateHideSourceItems"
                     @clicked-create="clickedCreate"
                     @remove-extensions-toggle="removeExtensionsToggle"
-                    :creationFn="creationFn"
+                    :suggestedName="initialSuggestedName"
                 >
                     <template v-slot:help-content>
                         <p>
@@ -163,6 +163,11 @@ export default {
     mixins: [mixin],
     created() {
         this._elementsSetUp();
+        this.initialSuggestedName = this._guessNameForPair(
+            this.workingElements[0],
+            this.workingElements[1],
+            this.removeExtensions
+        );
     },
     data: function () {
         return {
@@ -178,6 +183,8 @@ export default {
             minElements: 2,
             workingElements: [],
             invalidElements: [],
+            removeExtensions: true,
+            initialSuggestedName: "",
         };
     },
     computed: {
@@ -209,7 +216,7 @@ export default {
             /** data for list in progress */
             this.workingElements = [];
             // copy initial list, sort, add ids if needed
-            this.workingElements = this.initialElements.slice(0);
+            this.workingElements = JSON.parse(JSON.stringify(this.initialElements.slice(0)));
             this._ensureElementIds();
             this._validateElements();
         },
@@ -264,6 +271,41 @@ export default {
         toString: function () {
             return "PairCollectionCreator";
         },
+        removeExtensionsToggle: function () {
+            this.removeExtensions = !this.removeExtensions;
+            this.initialSuggestedName = this._guessNameForPair(
+                this.workingElements[0],
+                this.workingElements[1],
+                this.removeExtensions
+            );
+        },
+        _guessNameForPair: function (fwd, rev, removeExtensions) {
+            removeExtensions = removeExtensions ? removeExtensions : this.removeExtensions;
+            var fwdName = fwd.name;
+            var revName = rev.name;
+
+            var lcs = this._naiveStartingAndEndingLCS(fwdName, revName);
+
+            /** remove url prefix if files were uploaded by url */
+            var lastSlashIndex = lcs.lastIndexOf("/");
+            if (lastSlashIndex > 0) {
+                var urlprefix = lcs.slice(0, lastSlashIndex + 1);
+                lcs = lcs.replace(urlprefix, "");
+                fwdName = fwdName.replace(extension, "");
+                revName = revName.replace(extension, "");
+            }
+
+            if (removeExtensions) {
+                var lastDotIndex = lcs.lastIndexOf(".");
+                if (lastDotIndex > 0) {
+                    var extension = lcs.slice(lastDotIndex, lcs.length);
+                    lcs = lcs.replace(extension, "");
+                    fwdName = fwdName.replace(extension, "");
+                    revName = revName.replace(extension, "");
+                }
+            }
+            return lcs || `${fwdName} & ${revName}`;
+        },
     },
 };
 </script>
diff --git a/client/src/components/Collections/PairedElementView.vue b/client/src/components/Collections/PairedElementView.vue
index 9be35e6a35b..a742f3eb900 100644
--- a/client/src/components/Collections/PairedElementView.vue
+++ b/client/src/components/Collections/PairedElementView.vue
@@ -19,10 +19,14 @@ import ClickToEdit from "./common/ClickToEdit.vue";
 import _l from "utils/localization";
 export default {
     components: { ClickToEdit },
+    created: function () {
+        this.name = this.pair.name;
+    },
     data: function () {
         return {
             unpairButtonTitle: _l("Unpair"),
             titlePairName: _l("Click to rename"),
+            name: "",
         };
     },
     props: {
@@ -33,10 +37,6 @@ export default {
             required: true,
             type: Function,
         },
-        name: {
-            required: true,
-            type: String,
-        },
     },
     methods: {
         l(str) {
diff --git a/client/src/components/Collections/PairedListCollectionCreator.vue b/client/src/components/Collections/PairedListCollectionCreator.vue
index e3b84317ecd..5a0adc7beaf 100644
--- a/client/src/components/Collections/PairedListCollectionCreator.vue
+++ b/client/src/components/Collections/PairedListCollectionCreator.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="paired-list-collection-creator">
-        <div v-if="(state == 'error')">
+        <div v-if="state == 'error'">
             <b-alert show variant="danger">
                 {{ errorText }}
             </b-alert>
@@ -89,7 +89,7 @@
                         {{ allInvalidElementsPartTwo }}
                     </b-alert>
                 </div>
-                <div v-if="(state == 'duplicates')">
+                <div v-if="state == 'duplicates'">
                     <b-alert show variant="danger">
                         {{ l("Collections cannot have duplicated names. The following list names are duplicated: ") }}
                         <ul>
@@ -100,12 +100,11 @@
                 </div>
                 <collection-creator
                     :oncancel="oncancel"
-                    :hideSourceItems="hideSourceItems"
+                    :hide-source-items="hideSourceItems"
                     @onUpdateHideSourceItems="onUpdateHideSourceItems"
                     @clicked-create="clickedCreate"
                     @remove-extensions-toggle="removeExtensionsToggle"
-                    :renderExtensionsToggle="true"
-                    :creationFn="creationFn"
+                    :render-extensions-toggle="true"
                 >
                     <template v-slot:help-content>
                         <p>
@@ -335,7 +334,7 @@
                                 </div>
                             </div>
                         </div>
-                        <splitpanes horizontal style="height: 400px;">
+                        <splitpanes horizontal style="height: 400px">
                             <pane>
                                 <div v-if="noUnpairedElementsDisplayed">
                                     <b-alert show variant="warning">
@@ -408,8 +407,7 @@
                                                 v-for="pair in pairedElements"
                                                 :key="pair.id"
                                                 :pair="pair"
-                                                :name="pair.name"
-                                                :unlinkFn="clickUnpair(pair)"
+                                                :unlink-fn="clickUnpair(pair)"
                                                 @onPairRename="(name) => (pair.name = name)"
                                             />
                                         </draggable>
@@ -569,7 +567,7 @@ export default {
             this.selectedDatasetElems = [];
             this.initialFiltersSet();
             // copy initial list, sort, add ids if needed
-            this.workingElements = this.initialElements.slice(0);
+            this.workingElements = JSON.parse(JSON.stringify(this.initialElements.slice(0)));
             this._ensureElementIds();
             this._validateElements();
             this._sortInitialList();
@@ -693,27 +691,22 @@ export default {
         /** try to find a good pair name for the given fwd and rev datasets */
         _guessNameForPair: function (fwd, rev, removeExtensions) {
             removeExtensions = removeExtensions ? removeExtensions : this.removeExtensions;
-            var fwdName = fwd.name;
-            var revName = rev.name;
-
-            var lcs = this._naiveStartingAndEndingLCS(
-                fwdName.replace(new RegExp(this.filters[0]), ""),
-                revName.replace(new RegExp(this.filters[1]), "")
-            );
-
+            let fwdName = fwd.name;
+            let revName = rev.name;
+            const fwdNameFilter = fwdName.replace(new RegExp(this.forwardFilter), "");
+            const revNameFilter = revName.replace(new RegExp(this.reverseFilter), "");
+            let lcs = this._naiveStartingAndEndingLCS(fwdNameFilter, revNameFilter);
             /** remove url prefix if files were uploaded by url */
-            var lastSlashIndex = lcs.lastIndexOf("/");
+            const lastSlashIndex = lcs.lastIndexOf("/");
             if (lastSlashIndex > 0) {
-                var urlprefix = lcs.slice(0, lastSlashIndex + 1);
+                const urlprefix = lcs.slice(0, lastSlashIndex + 1);
                 lcs = lcs.replace(urlprefix, "");
-                fwdName = fwdName.replace(extension, "");
-                revName = revName.replace(extension, "");
             }
 
             if (removeExtensions) {
-                var lastDotIndex = lcs.lastIndexOf(".");
+                const lastDotIndex = lcs.lastIndexOf(".");
                 if (lastDotIndex > 0) {
-                    var extension = lcs.slice(lastDotIndex, lcs.length);
+                    const extension = lcs.slice(lastDotIndex, lcs.length);
                     lcs = lcs.replace(extension, "");
                     fwdName = fwdName.replace(extension, "");
                     revName = revName.replace(extension, "");
@@ -721,38 +714,6 @@ export default {
             }
             return lcs || `${fwdName} & ${revName}`;
         },
-        /** return the concat'd longest common prefix and suffix from two strings */
-        _naiveStartingAndEndingLCS: function (s1, s2) {
-            var fwdLCS = "";
-            var revLCS = "";
-            var i = 0;
-            var j = 0;
-            while (i < s1.length && i < s2.length) {
-                if (s1[i] !== s2[i]) {
-                    break;
-                }
-                fwdLCS += s1[i];
-                i += 1;
-            }
-            if (i === s1.length) {
-                return s1;
-            }
-            if (i === s2.length) {
-                return s2;
-            }
-
-            i = s1.length - 1;
-            j = s2.length - 1;
-            while (i >= 0 && j >= 0) {
-                if (s1[i] !== s2[j]) {
-                    break;
-                }
-                revLCS = [s1[i], revLCS].join("");
-                i -= 1;
-                j -= 1;
-            }
-            return fwdLCS + revLCS;
-        },
         clickAutopair: function () {
             // Unselect any selected elements
             this.selectedForwardElement = null;
@@ -969,7 +930,6 @@ export default {
         },
         clickedCreate: function (collectionName) {
             this.checkForDuplicates();
-            console.log(this.state, " = state");
             if (this.state == "build") {
                 this.$emit("clicked-create", this.workingElements, this.collectionName, this.hideSourceItems);
                 return this.creationFn(this.pairedElements, collectionName, this.hideSourceItems)
@@ -983,7 +943,6 @@ export default {
             var existingPairNames = {};
             this.duplicatePairNames = [];
             var valid = true;
-            console.log("in check for dupes");
             this.pairedElements.forEach((pair) => {
                 if (Object.prototype.hasOwnProperty.call(existingPairNames, pair.name)) {
                     valid = false;
@@ -992,7 +951,6 @@ export default {
                 }
                 existingPairNames[pair.name] = true;
             });
-            console.log("valid = false, right? :", valid);
             this.state = valid ? "build" : "duplicates";
         },
         stripExtension(name) {
diff --git a/client/src/components/Collections/common/CollectionCreator.vue b/client/src/components/Collections/common/CollectionCreator.vue
index 0dd0fe71267..efcee013b0d 100644
--- a/client/src/components/Collections/common/CollectionCreator.vue
+++ b/client/src/components/Collections/common/CollectionCreator.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="collection-creator">
         <div class="header flex-row no-flex">
-            <div class="main-help well clear" v-bind:class="{ expanded: isExpanded }">
+            <div class="main-help well clear" :class="{ expanded: isExpanded }">
                 <a
                     class="more-help"
                     href="javascript:void(0);"
@@ -73,7 +73,7 @@
                         @click="$emit('clicked-create', collectionName)"
                         :disabled="!validInput"
                     >
-                        {{ l("Create list") }}
+                        {{ l("Create collection") }}
                     </button>
                 </div>
             </div>
@@ -89,10 +89,6 @@ export default {
             type: Function,
             required: true,
         },
-        creationFn: {
-            type: Function,
-            required: true,
-        },
         renderExtensionsToggle: {
             type: Boolean,
             default: false,
@@ -101,6 +97,11 @@ export default {
             type: Boolean,
             required: true,
         },
+        suggestedName: {
+            type: String,
+            required: false,
+            default: "",
+        },
     },
     computed: {
         validInput: function () {
@@ -115,7 +116,7 @@ export default {
             placeholderEnterName: _l("Enter a name for your new collection"),
             dropdownText: _l("Create a <i>single</> pair"),
             isExpanded: false,
-            collectionName: "",
+            collectionName: this.suggestedName,
             removeFileExtensionsText: "Remove file extensions?",
             localHideSourceItems: this.hideSourceItems,
         };
diff --git a/client/src/components/Collections/common/mixin.js b/client/src/components/Collections/common/mixin.js
index 22685ef924d..e247100d05a 100644
--- a/client/src/components/Collections/common/mixin.js
+++ b/client/src/components/Collections/common/mixin.js
@@ -37,5 +37,37 @@ export default {
         onUpdateHideSourceItems(hideSourceItems) {
             this.hideSourceItems = hideSourceItems;
         },
+        /** return the concat'd longest common prefix and suffix from two strings */
+        _naiveStartingAndEndingLCS: function (s1, s2) {
+            var fwdLCS = "";
+            var revLCS = "";
+            var i = 0;
+            var j = 0;
+            while (i < s1.length && i < s2.length) {
+                if (s1[i] !== s2[i]) {
+                    break;
+                }
+                fwdLCS += s1[i];
+                i += 1;
+            }
+            if (i === s1.length) {
+                return s1;
+            }
+            if (i === s2.length) {
+                return s2;
+            }
+
+            i = s1.length - 1;
+            j = s2.length - 1;
+            while (i >= 0 && j >= 0) {
+                if (s1[i] !== s2[j]) {
+                    break;
+                }
+                revLCS = [s1[i], revLCS].join("");
+                i -= 1;
+                j -= 1;
+            }
+            return fwdLCS + revLCS;
+        },
     },
 };
diff --git a/client/src/components/Dataset/DatasetList.vue b/client/src/components/Dataset/DatasetList.vue
index 285c75d31d4..83c7a4a3502 100644
--- a/client/src/components/Dataset/DatasetList.vue
+++ b/client/src/components/Dataset/DatasetList.vue
@@ -23,9 +23,7 @@
                 No matching entries found for: <span class="font-weight-bold">{{ this.query }}</span
                 >.
             </div>
-            <div v-if="showNotAvailable">
-                No datasets found.
-            </div>
+            <div v-if="showNotAvailable">No datasets found.</div>
         </div>
     </div>
 </template>
diff --git a/client/src/components/History/ContentOperations.vue b/client/src/components/History/ContentOperations.vue
index 39fcf99eac1..d1b66ef6216 100644
--- a/client/src/components/History/ContentOperations.vue
+++ b/client/src/components/History/ContentOperations.vue
@@ -8,7 +8,7 @@
                 </a>
             </h6>
 
-            <PriorityMenu style="max-width: 50%;" :starting-height="27">
+            <PriorityMenu style="max-width: 50%" :starting-height="27">
                 <PriorityMenuItem
                     key="filter"
                     title="Filter History Content"
diff --git a/client/src/components/History/HistoryDetails.vue b/client/src/components/History/HistoryDetails.vue
index df40e8ec144..7894f7a47a6 100644
--- a/client/src/components/History/HistoryDetails.vue
+++ b/client/src/components/History/HistoryDetails.vue
@@ -5,7 +5,7 @@
                 <span class="size">{{ history.niceSize | localize }}</span>
             </h6>
 
-            <PriorityMenu style="max-width: 50%;" :starting-height="28">
+            <PriorityMenu style="max-width: 50%" :starting-height="28">
                 <PriorityMenuItem
                     key="edit-history-tags"
                     title="Edit History Tags"
diff --git a/client/src/components/HistoryExport/ExportLink.vue b/client/src/components/HistoryExport/ExportLink.vue
index 2b9ccd95edc..83ce4957c64 100644
--- a/client/src/components/HistoryExport/ExportLink.vue
+++ b/client/src/components/HistoryExport/ExportLink.vue
@@ -8,7 +8,7 @@
             title="Copy export URL to your clipboard"
             class="copy-export-link"
             icon="link"
-            style="cursor: pointer;"
+            style="cursor: pointer"
             @click="copyUrl"
         />
         <i
diff --git a/client/src/components/HistoryExport/Index.vue b/client/src/components/HistoryExport/Index.vue
index aa9b54c83bb..af3a7794efd 100644
--- a/client/src/components/HistoryExport/Index.vue
+++ b/client/src/components/HistoryExport/Index.vue
@@ -61,7 +61,6 @@ export default {
         async initialize() {
             const fileSources = await new Services().getFileSources();
             this.hasWritableFileSources = fileSources.some((fs) => fs.writable);
-            // console.log(fileSources);
             this.initializing = false;
         },
     },
diff --git a/client/src/components/HistoryExport/ToLink.vue b/client/src/components/HistoryExport/ToLink.vue
index a6b6d2c807c..9ede813b4c9 100644
--- a/client/src/components/HistoryExport/ToLink.vue
+++ b/client/src/components/HistoryExport/ToLink.vue
@@ -4,7 +4,7 @@
             {{ errorMessage }}
             <JobError
                 v-if="jobError"
-                style="margin-top: 15px;"
+                style="margin-top: 15px"
                 header="History export job ended in error"
                 :job="jobError"
             />
@@ -17,11 +17,11 @@
         </div>
         <div v-else-if="latestExportReady">
             Link for download ready
-            <export-link :historyExport="latestExport" />
+            <export-link :history-export="latestExport" />
             . Use this link to download the archive or import it on another Galaxy server.
         </div>
         <div v-else-if="hasReadyExport">
-            <p>An out of date export is ready <export-link :historyExport="latestReadyExport" />.</p>
+            <p>An out of date export is ready <export-link :history-export="latestReadyExport" />.</p>
 
             <p>
                 The history has changed since this export was generated,
diff --git a/client/src/components/HistoryExport/ToRemoteFile.vue b/client/src/components/HistoryExport/ToRemoteFile.vue
index c78bdf6bf30..a4f8142a757 100644
--- a/client/src/components/HistoryExport/ToRemoteFile.vue
+++ b/client/src/components/HistoryExport/ToRemoteFile.vue
@@ -4,7 +4,7 @@
             {{ errorMessage }}
             <JobError
                 v-if="jobError"
-                style="margin-top: 15px;"
+                style="margin-top: 15px"
                 header="History export job ended in error"
                 :job="jobError"
             />
@@ -25,7 +25,7 @@
                 description="Select a 'remote files' directory to export history archive to."
                 class="mt-3"
             >
-                <files-input id="directory" v-model="directory" mode="directory" :requireWritable="true" />
+                <files-input id="directory" v-model="directory" mode="directory" :require-writable="true" />
             </b-form-group>
             <b-form-group id="fieldset-name" label-for="name" description="Give the exported file a name." class="mt-3">
                 <b-form-input id="name" v-model="name" placeholder="Name" required></b-form-input>
diff --git a/client/src/components/HistoryImport.vue b/client/src/components/HistoryImport.vue
index 34feb5c28a9..df29ec5123a 100644
--- a/client/src/components/HistoryImport.vue
+++ b/client/src/components/HistoryImport.vue
@@ -4,7 +4,7 @@
             {{ errorMessage }}
             <JobError
                 v-if="jobError"
-                style="margin-top: 15px;"
+                style="margin-top: 15px"
                 header="History import job ended in error"
                 :job="jobError"
             />
diff --git a/client/src/components/HistoryView.vue b/client/src/components/HistoryView.vue
index 17139e4066b..2097ff141fd 100644
--- a/client/src/components/HistoryView.vue
+++ b/client/src/components/HistoryView.vue
@@ -11,9 +11,7 @@
                             Switch to this history
                         </button>
                     </span>
-                    <button id="show-structure" class="btn btn-secondary" @click="showStructure">
-                        Show structure
-                    </button>
+                    <button id="show-structure" class="btn btn-secondary" @click="showStructure">Show structure</button>
                 </span>
             </div>
             <div class="float-right">
@@ -28,7 +26,7 @@
         <div
             :id="'history-' + historyHistory['id']"
             class="history-panel unified-panel-body"
-            style="overflow: auto;"
+            style="overflow: auto"
         ></div>
     </div>
 </template>
diff --git a/client/src/components/InteractiveTools/InteractiveTools.vue b/client/src/components/InteractiveTools/InteractiveTools.vue
index 8906717daf1..e6007f9d19c 100644
--- a/client/src/components/InteractiveTools/InteractiveTools.vue
+++ b/client/src/components/InteractiveTools/InteractiveTools.vue
@@ -37,12 +37,8 @@
                 >
             </template>
             <template v-slot:cell(job_info)="row">
-                <label v-if="row.item.active">
-                    running
-                </label>
-                <label v-else>
-                    stopped
-                </label>
+                <label v-if="row.item.active"> running </label>
+                <label v-else> stopped </label>
             </template>
             <template v-slot:cell(created_time)="row">
                 <UtcDate :date="row.item.created_time" mode="elapsed" />
diff --git a/client/src/components/JobInformation/CodeRow.vue b/client/src/components/JobInformation/CodeRow.vue
index 2a837eef465..c97dbdded5f 100644
--- a/client/src/components/JobInformation/CodeRow.vue
+++ b/client/src/components/JobInformation/CodeRow.vue
@@ -1,38 +1,76 @@
 <template>
-    <tr @click="toggleExpanded">
+    <tr
+        @mousedown="mouseIsDown = true"
+        @mousemove="mouseIsDown ? (mouseMoved = true) : (mouseMoved = false)"
+        @mouseup="toggleExpanded()"
+        v-b-tooltip.hover
+        :title="`click to ${action}`"
+    >
         <td>
             {{ codeLabel }}
         </td>
-        <td v-if="expanded">
-            <pre class="code">{{ codeItem }}</pre>
-        </td>
-        <td v-else-if="codeItem">
-            <pre class="code preview">{{ codeItem }}</pre>
-            <b>(Click to expand)</b>
+        <td v-if="codeItem">
+            <b-row align-v="center">
+                <b-col cols="11">
+                    <pre :class="codeClass">{{ codeItem }}</pre>
+                </b-col>
+                <b-col class="nopadding pointer">
+                    <font-awesome-icon :icon="iconClass" />
+                </b-col>
+            </b-row>
         </td>
         <td v-else><i>empty</i></td>
     </tr>
 </template>
 <script>
-import Vue from "vue";
-import BootstrapVue from "bootstrap-vue";
-
-Vue.use(BootstrapVue);
+import { faCompressAlt, faExpandAlt } from "@fortawesome/free-solid-svg-icons";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
+library.add(faCompressAlt, faExpandAlt);
 export default {
+    components: {
+        FontAwesomeIcon,
+    },
     props: {
         codeLabel: String,
         codeItem: String,
     },
     data() {
-        return { expanded: false };
+        return {
+            mouseIsDown: false,
+            mouseMoved: false,
+            expanded: false,
+        };
+    },
+    computed: {
+        action() {
+            return this.expanded ? "collapse" : "expand";
+        },
+        codeClass() {
+            return this.expanded ? "code" : "code preview";
+        },
+        iconClass() {
+            return this.expanded ? ["fas", "compress-alt"] : ["fas", "expand-alt"];
+        },
     },
     methods: {
         toggleExpanded() {
-            if (this.codeItem) {
+            this.mouseIsDown = false;
+            if (this.codeItem && !this.mouseMoved) {
                 this.expanded = !this.expanded;
             }
         },
     },
 };
 </script>
+
+<style scoped>
+.pointer {
+    cursor: pointer;
+}
+.nopadding {
+    padding: 0;
+    margin: 0;
+}
+</style>
diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
index cd021076e3a..38eb4b4e914 100644
--- a/client/src/components/JobInformation/JobInformation.vue
+++ b/client/src/components/JobInformation/JobInformation.vue
@@ -30,9 +30,9 @@
                         <UtcDate :date="job.update_time" mode="pretty" />
                     </td>
                 </tr>
-                <code-row id="command-line" v-if="job" :codeLabel="'Command Line'" :codeItem="job.command_line" />
-                <code-row id="stdout" v-if="job" :codeLabel="'Tool Standard Output'" :codeItem="job.tool_stdout" />
-                <code-row id="stderr" v-if="job" :codeLabel="'Tool Standard Error'" :codeItem="job.tool_stderr" />
+                <code-row id="command-line" v-if="job" :code-label="'Command Line'" :code-item="job.command_line" />
+                <code-row id="stdout" v-if="job" :code-label="'Tool Standard Output'" :code-item="job.tool_stdout" />
+                <code-row id="stderr" v-if="job" :code-label="'Tool Standard Error'" :code-item="job.tool_stderr" />
                 <tr v-if="job">
                     <td>Tool Exit Code:</td>
                     <td id="exist-code">{{ job.exit_code }}</td>
@@ -40,7 +40,7 @@
                 <tr id="job-messages" v-if="job && job.job_messages && job.job_messages.length > 0">
                     <td>Job Messages</td>
                     <td>
-                        <ul style="padding-left: 15px; margin-bottom: 0px;">
+                        <ul style="padding-left: 15px; margin-bottom: 0px">
                             <li v-for="message in job.job_messages" :key="message">{{ message }}</li>
                         </ul>
                     </td>
diff --git a/client/src/components/JobParameters/JobParametersArrayValue.vue b/client/src/components/JobParameters/JobParametersArrayValue.vue
index 467021aaebb..5e0e6e6d449 100644
--- a/client/src/components/JobParameters/JobParametersArrayValue.vue
+++ b/client/src/components/JobParameters/JobParametersArrayValue.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <ul style="padding-inline-start: 25px;">
+        <ul style="padding-inline-start: 25px">
             <li v-for="(elVal, pvIndex) in parameter_value" :key="pvIndex">
                 <span v-if="elVal.src == 'hda'">
                     <a :href="appRoot() + 'datasets/' + elVal.id + '/show_params'">
diff --git a/client/src/components/Libraries/LibrariesList.vue b/client/src/components/Libraries/LibrariesList.vue
index cbd8af0dc92..a1eff576b73 100644
--- a/client/src/components/Libraries/LibrariesList.vue
+++ b/client/src/components/Libraries/LibrariesList.vue
@@ -9,9 +9,7 @@
                 Library
             </b-button>
             <SearchField :typingDelay="0" @updateSearch="searchValue($event)" />
-            <b-form-checkbox class="mr-1" @input="toggle_include_deleted($event)">
-                include deleted
-            </b-form-checkbox>
+            <b-form-checkbox class="mr-1" @input="toggle_include_deleted($event)"> include deleted </b-form-checkbox>
             <b-form-checkbox class="mr-1" @input="toggle_exclude_restricted($event)">
                 exclude restricted
             </b-form-checkbox>
@@ -121,7 +119,7 @@
                         size="sm"
                         class="lib-btn permission_library_btn"
                         :title="'Permissions of ' + row.item.name"
-                        :href="`${root}library/list#library/${row.item.id}/permissions`"
+                        :to="{ path: `/${row.item.id}/permissions` }"
                     >
                         <font-awesome-icon icon="users" />
                         Manage
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
index 4636edff5e7..61083a6173c 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
@@ -9,13 +9,13 @@
                 @deleteFromTable="deleteFromTable"
                 @setBusy="setBusy($event)"
                 @newFolder="newFolder"
-                :folderContents="folderContents"
+                :folder-contents="folderContents"
                 :include_deleted="include_deleted"
                 :folder_id="current_folder_id"
                 :selected="selected"
                 :metadata="folder_metadata"
                 :unselected="unselected"
-                :isAllSelectedMode="isAllSelectedMode"
+                :is-all-selected-mode="isAllSelectedMode"
             />
 
             <b-table
@@ -469,8 +469,8 @@ export default {
         },
         navigateToPermission(element) {
             if (element.type === "file")
-                this.$router.push({ path: `permissions/${this.folder_id}/dataset/${element.id}` });
-            else if (element.type === "folder") this.$router.push({ path: `permissions/${element.id}` });
+                this.$router.push({ path: `${this.folder_id}/dataset/${element.id}/permissions` });
+            else if (element.type === "folder") this.$router.push({ path: `${element.id}/permissions` });
         },
         getMessage(element) {
             if (element.type === "file") return element.message;
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
index 8916d2f1cc5..04f03c5a1c2 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
@@ -3,7 +3,7 @@
         <b-container fluid>
             <div v-if="dataset">
                 <b-breadcrumb>
-                    <b-breadcrumb-item title="Return to the list of libraries" :href="`${root}libraries`">
+                    <b-breadcrumb-item title="Return to the list of libraries" :to="{ path: `/` }">
                         Libraries
                     </b-breadcrumb-item>
                     <template v-for="path_item in this.dataset.full_path">
@@ -116,14 +116,14 @@
 import Vue from "vue";
 import { getAppRoot } from "onload/loadConfig";
 import BootstrapVue from "bootstrap-vue";
-import { Services } from "./services";
+import { Services } from "components/Libraries/LibraryPermissions/services";
 import { Toast } from "ui/toast";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { getGalaxyInstance } from "app";
-import PermissionsInputField from "./PermissionsInputField.vue";
+import PermissionsInputField from "components/Libraries/LibraryPermissions/PermissionsInputField";
 import { initPermissionsIcons } from "components/Libraries/icons";
-import LibraryPermissionsWarning from "components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryPermissionsWarning.vue";
-import { extractRoles } from "./utils";
+import LibraryPermissionsWarning from "components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryPermissionsWarning";
+import { extractRoles } from "components/Libraries/library-utils";
 
 import "vue-multiselect/dist/vue-multiselect.min.css";
 import VueObserveVisibility from "vue-observe-visibility";
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderPermissions.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderPermissions.vue
index 2db71a0a130..0070c5cd1af 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderPermissions.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderPermissions.vue
@@ -1,70 +1,55 @@
 <template>
     <div>
-        <div>
-            <div v-if="folder">
-                <b-button
-                    variant="primary"
-                    title="back to parent folder"
-                    :to="{ path: `/folders/${this.folder.parent_id}` }"
-                >
-                    <font-awesome-icon icon="angle-double-left" />
-                </b-button>
-                <div>
-                    <div class="header text-center">{{ folder.name }}</div>
-                </div>
-            </div>
-            <LibraryPermissionsWarning :is_admin="is_admin" />
-            <hr class="my-4" />
-            <b-container fluid>
-                <div class="dataset_table">
-                    <h2 class="text-center">Folder permissions</h2>
-                    <PermissionsInputField
-                        v-if="manage_folder_role_list"
-                        :id="folder_id"
-                        :permission_type="manage_type"
-                        :initial_value="manage_folder_role_list"
-                        :apiRootUrl="apiRootUrl"
-                        alert="User with <strong>any</strong> of these roles can manage permissions on this folder."
-                        title="Roles that can manage permissions on this folder"
-                        @input="setUserPermissionsPreferences"
-                    />
+        <PermissionsHeader v-if="folder" :name="folder.name" :path="`/folders/${this.folder.parent_id}`" />
+        <b-container fluid>
+            <div class="dataset_table">
+                <h2 class="text-center">Folder permissions</h2>
+                <PermissionsInputField
+                    v-if="manage_folder_role_list"
+                    :id="folder_id"
+                    :permission_type="manage_type"
+                    :initial_value="manage_folder_role_list"
+                    :apiRootUrl="apiRootUrl"
+                    alert="User with <strong>any</strong> of these roles can manage permissions on this folder."
+                    title="Roles that can manage permissions on this folder"
+                    @input="setUserPermissionsPreferences"
+                />
 
-                    <PermissionsInputField
-                        v-if="add_library_item_role_list"
-                        :id="folder_id"
-                        :permission_type="add_type"
-                        :initial_value="add_library_item_role_list"
-                        :apiRootUrl="apiRootUrl"
-                        title="Roles that can add items to this folder"
-                        alert="User with <strong>any</strong> of these roles can add items to this folder (folders and
+                <PermissionsInputField
+                    v-if="add_library_item_role_list"
+                    :id="folder_id"
+                    :permission_type="add_type"
+                    :initial_value="add_library_item_role_list"
+                    :apiRootUrl="apiRootUrl"
+                    title="Roles that can add items to this folder"
+                    alert="User with <strong>any</strong> of these roles can add items to this folder (folders and
                                 datasets)."
-                        @input="setUserPermissionsPreferences"
-                    />
+                    @input="setUserPermissionsPreferences"
+                />
 
-                    <PermissionsInputField
-                        v-if="modify_folder_role_list"
-                        :id="folder_id"
-                        :permission_type="modify_type"
-                        :initial_value="modify_folder_role_list"
-                        :apiRootUrl="apiRootUrl"
-                        title="Roles that can modify this folder"
-                        alert="User with <strong>any</strong> of these roles can modify this folder (name, etc.)."
-                        @input="setUserPermissionsPreferences"
-                    />
-                    <button
-                        data-toggle="tooltip"
-                        data-placement="top"
-                        title="Save modifications"
-                        class="btn btn-secondary toolbtn_save_permissions primary-button"
-                        type="button"
-                        @click="postPermissions"
-                    >
-                        <font-awesome-icon :icon="['far', 'save']" />
-                        &nbsp;Save
-                    </button>
-                </div>
-            </b-container>
-        </div>
+                <PermissionsInputField
+                    v-if="modify_folder_role_list"
+                    :id="folder_id"
+                    :permission_type="modify_type"
+                    :initial_value="modify_folder_role_list"
+                    :apiRootUrl="apiRootUrl"
+                    title="Roles that can modify this folder"
+                    alert="User with <strong>any</strong> of these roles can modify this folder (name, etc.)."
+                    @input="setUserPermissionsPreferences"
+                />
+                <button
+                    data-toggle="tooltip"
+                    data-placement="top"
+                    title="Save modifications"
+                    class="btn btn-secondary toolbtn_save_permissions primary-button"
+                    type="button"
+                    @click="postPermissions"
+                >
+                    <font-awesome-icon :icon="['far', 'save']" />
+                    &nbsp;Save
+                </button>
+            </div>
+        </b-container>
     </div>
 </template>
 
@@ -72,13 +57,12 @@
 import Vue from "vue";
 import { getAppRoot } from "onload/loadConfig";
 import BootstrapVue from "bootstrap-vue";
-import { Services } from "./services";
+import { Services } from "components/Libraries/LibraryPermissions/services";
 import { Toast } from "ui/toast";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { getGalaxyInstance } from "app";
-import PermissionsInputField from "./PermissionsInputField.vue";
-import LibraryPermissionsWarning from "components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryPermissionsWarning.vue";
-import { extractRoles } from "./utils";
+import PermissionsInputField from "components/Libraries/LibraryPermissions/PermissionsInputField";
+import PermissionsHeader from "components/Libraries/LibraryPermissions/PermissionsHeader";
+import { extractRoles } from "components/Libraries/library-utils";
 
 import { initPermissionsIcons } from "components/Libraries/icons";
 
@@ -94,14 +78,13 @@ export default {
     },
     components: {
         PermissionsInputField,
-        LibraryPermissionsWarning,
+        PermissionsHeader,
         FontAwesomeIcon,
     },
     data() {
         return {
             permissions: undefined,
             folder: undefined,
-            is_admin: undefined,
             add_library_item_role_list: undefined,
             modify_folder_role_list: undefined,
             manage_folder_role_list: undefined,
@@ -112,10 +95,8 @@ export default {
         };
     },
     created() {
-        const Galaxy = getGalaxyInstance();
         this.root = getAppRoot();
         this.services = new Services({ root: this.root });
-        this.is_admin = Galaxy.user.attributes.is_admin;
         this.services.getFolderPermissions(this.folder_id).then((fetched_permissions) => {
             this.add_library_item_role_list = extractRoles(fetched_permissions.add_library_item_role_list);
             this.manage_folder_role_list = extractRoles(fetched_permissions.manage_folder_role_list);
@@ -152,9 +133,3 @@ export default {
     },
 };
 </script>
-
-<style scoped>
-.header {
-    font-size: 45px;
-}
-</style>
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/utils.js b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/utils.js
deleted file mode 100644
index 692c1db1b51..00000000000
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/utils.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// legacy code
-export function extractRoles(role_list) {
-    const selected_roles = [];
-    role_list.forEach((item) => {
-        selected_roles.push({ name: item[0], id: item[1] });
-    });
-
-    return selected_roles;
-}
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
index 15aede0edec..f1c64ffbde7 100644
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -3,7 +3,7 @@
         <div class="form-inline d-flex align-items-center mb-2">
             <b-button
                 class="mr-1 btn btn-secondary"
-                :to="{ path: `/libraries` }"
+                :to="{ path: `/` }"
                 data-toggle="tooltip"
                 title="Go to libraries list"
             >
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js b/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js
index 138855c0dfe..b1325b50c9c 100644
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js
@@ -9,7 +9,8 @@ import LIST_CREATOR from "components/Collections/ListCollectionCreator";
 import LIST_CREATOR_MODAL from "components/Collections/ListCollectionCreatorModal";
 import PAIR_CREATOR from "components/Collections/PairCollectionCreator";
 import PAIR_CREATOR_MODAL from "components/Collections/PairCollectionCreatorModal";
-import PAIRED_CREATOR from "components/Collections/PairedListCollectionCreatorModal";
+import PAIRED_CREATOR from "components/Collections/PairedListCollectionCreator";
+import PAIRED_CREATOR_MODAL from "components/Collections/PairedListCollectionCreatorModal";
 import RULE_CREATOR_MODAL from "components/Collections/RuleBasedCollectionCreatorModal";
 import HDCA_MODEL from "mvc/history/hdca-model";
 
@@ -33,8 +34,10 @@ var ImportCollectionModal = Backbone.View.extend({
         this.histories = new mod_library_model.GalaxyHistories();
         return this.histories.fetch();
     },
-    createNewHistory: function (new_history_name) {
-        return axios.post(`${getAppRoot()}api/histories`, { name: new_history_name });
+    async createNewHistory(new_history_name) {
+        const { data } = await axios.post(`${getAppRoot()}api/histories`, { name: new_history_name });
+        getGalaxyInstance().currHistoryPanel.switchToHistory(data.id);
+        return data;
     },
     showCollectionSelect: function (e) {
         const Galaxy = getGalaxyInstance();
@@ -144,16 +147,32 @@ var ImportCollectionModal = Backbone.View.extend({
                 creator_class
             );
         } else if (this.collectionType === "list:paired") {
-            const elements = collection_elements.map((element) => ({
-                id: element.id,
-                name: element.name,
-                src: "ldda",
-            }));
-            PAIRED_CREATOR.pairedListCollectionCreatorModal(elements, {
-                historyId: history_id,
-                title: modal_title,
-                defaultHideSourceItems: true,
-            });
+            creator_class = PAIRED_CREATOR;
+            creationFn = (elements, name, hideSourceItems) => {
+                elements = elements.map((pair) => ({
+                    collection_type: "paired",
+                    src: "new_collection",
+                    name: pair.name,
+                    element_identifiers: [
+                        {
+                            name: "forward",
+                            id: pair.forward.id,
+                            src: "ldda",
+                        },
+                        {
+                            name: "reverse",
+                            id: pair.reverse.id,
+                            src: "ldda",
+                        },
+                    ],
+                }));
+                return this.createHDCA(elements, "list:paired", name, hideSourceItems, history_id);
+            };
+            PAIRED_CREATOR_MODAL.pairedListCollectionCreatorModal(
+                collection_elements,
+                { creationFn: creationFn, title: modal_title, defaultHideSourceItems: true },
+                creator_class
+            );
         } else if (this.collectionType === "rules") {
             const creationFn = (elements, collectionType, name, hideSourceItems) => {
                 return this.createHDCA(elements, collectionType, name, hideSourceItems, history_id);
diff --git a/client/src/components/Libraries/LibraryFolderRouter.js b/client/src/components/Libraries/LibraryFolderRouter.js
index abe0b5c76e6..38c2dec8863 100644
--- a/client/src/components/Libraries/LibraryFolderRouter.js
+++ b/client/src/components/Libraries/LibraryFolderRouter.js
@@ -5,6 +5,7 @@ import LibraryFolderPermissions from "components/Libraries/LibraryFolder/Library
 import LibraryFolder from "components/Libraries/LibraryFolder/LibraryFolder.vue";
 import LibraryFolderDatasetPermissions from "components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue";
 import LibrariesList from "components/Libraries/LibrariesList.vue";
+import LibraryPermissions from "components/Libraries/LibraryPermissions/LibraryPermissions.vue";
 
 Vue.use(VueRouter);
 
@@ -17,6 +18,12 @@ export default new VueRouter({
             name: "LibrariesList",
             component: LibrariesList,
         },
+        {
+            path: "/:library_id/permissions",
+            name: "LibraryPermissions",
+            component: LibraryPermissions,
+            props: true,
+        },
         {
             path: "/folders/:folder_id",
             name: "LibraryFolder",
@@ -24,13 +31,13 @@ export default new VueRouter({
             props: true,
         },
         {
-            path: "/folders/permissions/:folder_id",
+            path: "/folders/:folder_id/permissions",
             name: "LibraryFolder",
             component: LibraryFolderPermissions,
             props: true,
         },
         {
-            path: "/folders/permissions/:folder_id/dataset/:dataset_id",
+            path: "/folders/:folder_id/dataset/:dataset_id/permissions",
             name: "LibraryFolder",
             component: LibraryFolderDatasetPermissions,
             props: true,
diff --git a/client/src/components/Libraries/LibraryPermissions/LibraryPermissions.vue b/client/src/components/Libraries/LibraryPermissions/LibraryPermissions.vue
new file mode 100644
index 00000000000..38736a473b8
--- /dev/null
+++ b/client/src/components/Libraries/LibraryPermissions/LibraryPermissions.vue
@@ -0,0 +1,143 @@
+<template>
+    <div>
+        <PermissionsHeader v-if="library" :name="library.name" path="/" />
+        <h2 class="text-center">Library permissions</h2>
+        <PermissionsInputField
+            v-if="access_library_role_list"
+            :id="library_id"
+            :permission_type="access_type"
+            :initial_value="access_library_role_list"
+            :apiRootUrl="apiRootUrl"
+            alert="User with <strong>any</strong> of these roles can access this library. If there are no access roles set on the library it is considered <strong>unrestricted</strong>."
+            title="Roles that can access the library"
+            @input="setUserPermissionsPreferences"
+        />
+        <PermissionsInputField
+            v-if="manage_library_role_list"
+            :id="library_id"
+            :permission_type="manage_type"
+            :initial_value="manage_library_role_list"
+            :apiRootUrl="apiRootUrl"
+            alert="User with <strong>any</strong> of these roles can manage permissions on this library (includes giving access)."
+            title="Roles that can manage permissions on this library"
+            @input="setUserPermissionsPreferences"
+        />
+
+        <PermissionsInputField
+            v-if="add_library_item_role_list"
+            :id="library_id"
+            :permission_type="add_type"
+            :initial_value="add_library_item_role_list"
+            :apiRootUrl="apiRootUrl"
+            class="add_perm"
+            alert="User with <strong>any</strong> of these roles can add items to this library (folders and datasets)."
+            title="Roles that can add items to this library"
+            @input="setUserPermissionsPreferences"
+        />
+        <PermissionsInputField
+            v-if="modify_library_role_list"
+            :id="library_id"
+            :permission_type="modify_type"
+            :initial_value="modify_library_role_list"
+            :apiRootUrl="apiRootUrl"
+            alert="User with  <strong>any</strong> of these roles can modify this library (name, synopsis, etc.)."
+            title="Roles that can modify this library"
+            @input="setUserPermissionsPreferences"
+        />
+        <button title="Save modifications" class="toolbtn_save_permissions" @click="postPermissions">
+            <font-awesome-icon :icon="['far', 'save']" />
+            Save
+        </button>
+    </div>
+</template>
+
+<script>
+import Vue from "vue";
+import { getAppRoot } from "onload/loadConfig";
+import BootstrapVue from "bootstrap-vue";
+import { Services } from "components/Libraries/LibraryPermissions/services";
+import { Toast } from "ui/toast";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import PermissionsHeader from "components/Libraries/LibraryPermissions/PermissionsHeader";
+import { extractRoles } from "components/Libraries/library-utils";
+import { initPermissionsIcons } from "components/Libraries/icons";
+import PermissionsInputField from "components/Libraries/LibraryPermissions/PermissionsInputField";
+
+Vue.use(BootstrapVue);
+initPermissionsIcons();
+
+export default {
+    props: {
+        library_id: {
+            type: String,
+            required: true,
+        },
+    },
+    components: {
+        PermissionsHeader,
+        PermissionsInputField,
+        FontAwesomeIcon,
+    },
+    data() {
+        return {
+            permissions: undefined,
+            library: undefined,
+            add_library_item_role_list: undefined,
+            manage_library_role_list: undefined,
+            modify_library_role_list: undefined,
+            access_library_role_list: undefined,
+            apiRootUrl: `${getAppRoot()}api/libraries`,
+            add_type: "add_library_item_role_list",
+            manage_type: "manage_library_role_list",
+            modify_type: "modify_library_role_list",
+            access_type: "access_library_role_list",
+        };
+    },
+    created() {
+        this.root = getAppRoot();
+        this.services = new Services({ root: this.root });
+        this.services.getLibraryPermissions(this.library_id).then((fetched_permissions) => {
+            console.log("fetched_permissions", fetched_permissions);
+            this.add_library_item_role_list = extractRoles(fetched_permissions.add_library_item_role_list);
+            this.manage_library_role_list = extractRoles(fetched_permissions.manage_library_role_list);
+            this.modify_library_role_list = extractRoles(fetched_permissions.modify_library_role_list);
+            this.access_library_role_list = extractRoles(fetched_permissions.access_library_role_list);
+        });
+        this.services.getLibrary(this.library_id).then((library) => {
+            this.library = library;
+        });
+    },
+
+    methods: {
+        setUserPermissionsPreferences(ids, permission_type) {
+            this[permission_type] = ids;
+        },
+        postPermissions() {
+            this.services.setPermissions(
+                this.apiRootUrl,
+                this.library_id,
+                [
+                    { "add_ids[]": this.add_library_item_role_list },
+                    { "manage_ids[]": this.manage_library_role_list },
+                    { "modify_ids[]": this.modify_library_role_list },
+                    { "access_ids[]": this.access_library_role_list },
+                ],
+                (fetched_permissions) => {
+                    Toast.success("Library permissions saved.");
+                    this.permissions = fetched_permissions;
+                },
+                (error) => {
+                    Toast.error("An error occurred while attempting to set folder permissions.");
+                    console.error(error);
+                }
+            );
+        },
+    },
+};
+</script>
+
+<style scoped>
+.header {
+    font-size: 45px;
+}
+</style>
diff --git a/client/src/components/Libraries/LibraryPermissions/PermissionsHeader.vue b/client/src/components/Libraries/LibraryPermissions/PermissionsHeader.vue
new file mode 100644
index 00000000000..b07d369bb93
--- /dev/null
+++ b/client/src/components/Libraries/LibraryPermissions/PermissionsHeader.vue
@@ -0,0 +1,48 @@
+<template>
+    <div>
+        <div v-if="name">
+            <b-button variant="primary" title="back to parent folder" :to="{ path: `${this.path}` }">
+                <font-awesome-icon icon="angle-double-left" />
+            </b-button>
+            <div>
+                <div class="header text-center">{{ name }}</div>
+            </div>
+        </div>
+        <LibraryPermissionsWarning :is_admin="is_admin" />
+        <hr class="my-4" />
+    </div>
+</template>
+
+<script>
+import { getGalaxyInstance } from "app";
+import LibraryPermissionsWarning from "components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryPermissionsWarning.vue";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+
+export default {
+    props: {
+        name: {
+            type: String,
+            required: true,
+        },
+        path: {
+            type: String,
+            required: true,
+        },
+    },
+    components: {
+        LibraryPermissionsWarning,
+        FontAwesomeIcon,
+    },
+    data() {
+        return {
+            is_admin: getGalaxyInstance().user.attributes.is_admin,
+        };
+    },
+};
+</script>
+
+<style scoped>
+.header {
+    font-size: 45px;
+}
+</style>
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/PermissionsInputField.vue b/client/src/components/Libraries/LibraryPermissions/PermissionsInputField.vue
similarity index 98%
rename from client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/PermissionsInputField.vue
rename to client/src/components/Libraries/LibraryPermissions/PermissionsInputField.vue
index cfcb571bcb3..800da974729 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/PermissionsInputField.vue
+++ b/client/src/components/Libraries/LibraryPermissions/PermissionsInputField.vue
@@ -40,7 +40,7 @@ import Vue from "vue";
 
 import VueObserveVisibility from "vue-observe-visibility";
 import Multiselect from "vue-multiselect";
-import { Services } from "./services";
+import { Services } from "components/Libraries/LibraryPermissions/services";
 import "vue-multiselect/dist/vue-multiselect.min.css";
 
 Vue.use(VueObserveVisibility);
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/services.js b/client/src/components/Libraries/LibraryPermissions/services.js
similarity index 85%
rename from client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/services.js
rename to client/src/components/Libraries/LibraryPermissions/services.js
index 89700478c55..9154427dd76 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/services.js
+++ b/client/src/components/Libraries/LibraryPermissions/services.js
@@ -7,6 +7,26 @@ export class Services {
         this.root = options.root || getAppRoot();
     }
 
+    async getLibraryPermissions(id) {
+        const url = `${this.root}api/libraries/${id}/permissions?scope=current`;
+        try {
+            const response = await axios.get(url);
+            return response.data;
+        } catch (e) {
+            rethrowSimple(e);
+        }
+    }
+
+    async getLibrary(id) {
+        const url = `${this.root}api/libraries/${id}`;
+        try {
+            const response = await axios.get(url);
+            return response.data;
+        } catch (e) {
+            rethrowSimple(e);
+        }
+    }
+
     async getFolderPermissions(id) {
         const url = `${this.root}api/folders/${id}/permissions?scope=current`;
         try {
@@ -16,6 +36,7 @@ export class Services {
             rethrowSimple(e);
         }
     }
+
     async getDatasetPermissions(id) {
         const url = `${this.root}api/libraries/datasets/${id}/permissions?scope=current`;
         try {
@@ -25,6 +46,7 @@ export class Services {
             rethrowSimple(e);
         }
     }
+
     async getDataset(id) {
         const url = `${this.root}api/libraries/datasets/${id}`;
         try {
@@ -34,6 +56,7 @@ export class Services {
             rethrowSimple(e);
         }
     }
+
     async getFolder(id) {
         const url = `${this.root}api/folders/${id}`;
         try {
@@ -43,6 +66,7 @@ export class Services {
             rethrowSimple(e);
         }
     }
+
     async getSelectOptions(apiRootUrl, id, is_library_access, page, page_limit, searchQuery) {
         searchQuery = searchQuery ? `&q=${searchQuery}` : "";
         const url = `${apiRootUrl}/${id}/permissions?scope=available&is_library_access=${is_library_access}&page_limit=${page_limit}&page=${page}${searchQuery}`;
@@ -76,6 +100,7 @@ export class Services {
                 onError(response);
             });
     }
+
     async toggleDatasetPrivacy(id, isMakePrivate, onSuccess, onError) {
         await axios
             .post(
diff --git a/client/src/components/Libraries/library-utils.js b/client/src/components/Libraries/library-utils.js
index ae47e78e2ed..11b4b1af569 100644
--- a/client/src/components/Libraries/library-utils.js
+++ b/client/src/components/Libraries/library-utils.js
@@ -9,3 +9,13 @@ export function onError(error) {
         Toast.error("An error occurred during with the last library interaction");
     }
 }
+
+// legacy code
+export function extractRoles(role_list) {
+    const selected_roles = [];
+    role_list.forEach((item) => {
+        selected_roles.push({ name: item[0], id: item[1] });
+    });
+
+    return selected_roles;
+}
diff --git a/client/src/components/License/LicenseSelector.vue b/client/src/components/License/LicenseSelector.vue
index f8b2a46f977..b24c336d484 100644
--- a/client/src/components/License/LicenseSelector.vue
+++ b/client/src/components/License/LicenseSelector.vue
@@ -2,7 +2,7 @@
     <div v-if="editLicense">
         <loading-span v-if="licensesLoading" message="Loading licenses..." />
         <b-form-select v-else v-model="license" :options="licenseOptions"></b-form-select>
-        <License v-if="currentLicenseInfo" :licenseId="license" :inputLicenseInfo="currentLicenseInfo">
+        <License v-if="currentLicenseInfo" :license-id="license" :input-license-info="currentLicenseInfo">
             <template v-slot:buttons>
                 <font-awesome-icon v-b-tooltip.hover title="Save License" icon="save" @click="onSave" />
                 <font-awesome-icon v-b-tooltip.hover title="Cancel Edit" icon="times" @click="disableEdit" />
@@ -14,7 +14,7 @@
         </div>
     </div>
     <div v-else-if="license">
-        <License :licenseId="license">
+        <License :license-id="license">
             <template v-slot:buttons>
                 <font-awesome-icon v-b-tooltip.hover title="Edit License" icon="edit" @click="editLicense = true" />
             </template>
diff --git a/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue b/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
index 7c089661d21..10e5679d1e6 100644
--- a/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
+++ b/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
@@ -2,6 +2,20 @@
     <div class="w-50 p-2 float-left">
         <b-card body-class="p-0">
             <b-card-header>
+                <span class="float-right">
+                    <b-button
+                        :href="downloadUrl"
+                        variant="link"
+                        size="sm"
+                        role="button"
+                        title="Download Collection"
+                        type="button"
+                        class="py-0 px-1"
+                        v-b-tooltip.hover
+                    >
+                        <span class="fa fa-download" />
+                    </b-button>
+                </span>
                 <span>
                     <span>Dataset Collection:</span>
                     <span class="font-weight-light">{{ collectionName }}</span>
@@ -18,6 +32,7 @@
 </template>
 
 <script>
+import { getAppRoot } from "onload/loadConfig";
 import axios from "axios";
 import CollectionTree from "./CollectionTree";
 import LoadingSpan from "components/LoadingSpan";
@@ -58,6 +73,9 @@ export default {
             const collection = this.collections[collectionId];
             return collection.url;
         },
+        downloadUrl() {
+            return `${getAppRoot()}api/dataset_collections/${this.args.history_dataset_collection_id}/download`;
+        },
     },
     methods: {
         async getContent() {
diff --git a/client/src/components/Markdown/Elements/HistoryDatasetDisplay.vue b/client/src/components/Markdown/Elements/HistoryDatasetDisplay.vue
index 1490d57df06..f971f8329ce 100644
--- a/client/src/components/Markdown/Elements/HistoryDatasetDisplay.vue
+++ b/client/src/components/Markdown/Elements/HistoryDatasetDisplay.vue
@@ -38,12 +38,8 @@
                     <pre v-if="itemContent.item_data">
                         <code class="text-normalwrap">{{ itemContent.item_data }}</code>
                     </pre>
-                    <div v-else>
-                        No content found.
-                    </div>
-                    <b-link v-if="itemContent.truncated" :href="itemContent.item_url">
-                        Show More...
-                    </b-link>
+                    <div v-else>No content found.</div>
+                    <b-link v-if="itemContent.truncated" :href="itemContent.item_url"> Show More... </b-link>
                 </div>
             </b-card-body>
         </b-card>
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
index b4f4be3c3a5..a3d866c09d1 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
@@ -15,6 +15,17 @@
                     >
                         <span class="fa fa-download" />
                     </b-button>
+                    <b-button
+                        :href="importUrl"
+                        role="button"
+                        variant="link"
+                        title="Import Workflow"
+                        type="button"
+                        class="py-0 px-1"
+                        v-b-tooltip.hover
+                    >
+                        <span class="fa fa-file-import" />
+                    </b-button>
                 </span>
                 <span>
                     <span>Workflow:</span>
@@ -78,6 +89,9 @@ export default {
         downloadUrl() {
             return `${getAppRoot()}api/workflows/${this.args.workflow_id}/download?format=json-download`;
         },
+        importUrl() {
+            return `${getAppRoot()}workflow/imp?id=${this.args.workflow_id}`;
+        },
         itemUrl() {
             return `${getAppRoot()}api/workflows/${this.args.workflow_id}/download?style=preview`;
         },
diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js
index f7e1b6c277a..68445192336 100644
--- a/client/src/components/Masthead/Masthead.test.js
+++ b/client/src/components/Masthead/Masthead.test.js
@@ -70,7 +70,7 @@ describe("Masthead.vue", () => {
                 hidden: true,
             },
         ];
-        const activeTab = "shared";
+        const initialActiveTab = "shared";
 
         // scratchbook assumes this is a Backbone collection - mock that out.
         tabs.add = (x) => {
@@ -86,7 +86,7 @@ describe("Masthead.vue", () => {
         wrapper = mount(Masthead, {
             propsData: {
                 mastheadState,
-                activeTab,
+                initialActiveTab,
             },
             localVue,
         });
@@ -138,9 +138,9 @@ describe("Masthead.vue", () => {
     it("should display scratchbook button", async () => {
         expect(wrapper.find("#enable-scratchbook a span").classes("fa-th")).toBe(true);
         expect(scratchbook.active).toBe(false);
-        // wrapper.find("#enable-scratchbook a").trigger("click");
-        // await localVue.nextTick();
-        // expect(scratchbook.active).to.equals(true);
+        wrapper.find("#enable-scratchbook a").trigger("click");
+        await localVue.nextTick();
+        expect(scratchbook.active).toBe(true);
     });
 
     it("should load webhooks on creation", async () => {
diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue
index 17672ff84ab..bc8e155c4a3 100644
--- a/client/src/components/Masthead/Masthead.vue
+++ b/client/src/components/Masthead/Masthead.vue
@@ -48,7 +48,7 @@ export default {
             type: String,
             default: null,
         },
-        activeTab: {
+        initialActiveTab: {
             type: String,
             default: null,
         },
@@ -96,6 +96,7 @@ export default {
     },
     data() {
         return {
+            activeTab: null,
             baseTabs: [],
             extensionTabs: [],
         };
@@ -115,6 +116,7 @@ export default {
         },
     },
     created() {
+        this.activeTab = this.initialActiveTab;
         this.baseTabs = fetchMenu(this.menuOptions);
         loadWebhookMenuItems(this.extensionTabs);
     },
diff --git a/client/src/components/Masthead/MastheadItem.vue b/client/src/components/Masthead/MastheadItem.vue
index 79702acd17a..f98a3eb2ccc 100644
--- a/client/src/components/Masthead/MastheadItem.vue
+++ b/client/src/components/Masthead/MastheadItem.vue
@@ -35,7 +35,9 @@
         @show="open(tab, $event)"
     >
         <template v-for="(item, idx) in tab.menu">
+            <div v-if="item.divider" class="dropdown-divider" :key="`divider-${idx}`" />
             <b-dropdown-item
+                v-else-if="item.hidden !== true"
                 :href="formatUrl(item.url)"
                 :key="`item-${idx}`"
                 :target="item.target || '_parent'"
@@ -45,7 +47,6 @@
             >
                 {{ item.title }}
             </b-dropdown-item>
-            <div v-if="item.divider" class="dropdown-divider" :key="`divider-${idx}`" />
         </template>
     </b-nav-item-dropdown>
 </template>
diff --git a/client/src/components/PluginList.vue b/client/src/components/PluginList.vue
index 53cb80954a4..b35ae7e2032 100644
--- a/client/src/components/PluginList.vue
+++ b/client/src/components/PluginList.vue
@@ -36,9 +36,9 @@
                                 <div class="font-weight-bold">Select a dataset to visualize:</div>
                                 <div class="ui-select">
                                     <select class="select" v-model="selected">
-                                        <option v-for="file in hdas" :key="file.id" :value="file.id">{{
-                                            file.name
-                                        }}</option>
+                                        <option v-for="file in hdas" :key="file.id" :value="file.id">
+                                            {{ file.name }}
+                                        </option>
                                     </select>
                                     <div class="icon-dropdown fa fa-caret-down" />
                                 </div>
diff --git a/client/src/components/RuleBuilder/ColumnSelector.vue b/client/src/components/RuleBuilder/ColumnSelector.vue
index df4178e32b7..0ac1d1d1b82 100644
--- a/client/src/components/RuleBuilder/ColumnSelector.vue
+++ b/client/src/components/RuleBuilder/ColumnSelector.vue
@@ -30,7 +30,8 @@
                 </span>
                 <span class="rule-column-selector-target-select" v-else>
                     <select2 @input="handleAdd" placeholder="Select a column">
-                        <option /><!-- empty option selection for placeholder -->
+                        <option />
+                        <!-- empty option selection for placeholder -->
                         <option v-for="(col, index) in remainingHeaders" :value="index" :key="col">{{ col }}</option>
                     </select2>
                 </span>
@@ -117,10 +118,14 @@ export default {
             }
         },
         handleAdd(value) {
+            // TODO: Rework add/remove here to not mutate props.
+            // eslint-disable-next-line vue/no-mutating-props
             this.target.push(parseInt(value));
             this.$emit("update:orderedEdit", false);
         },
         handleRemove(index) {
+            // TODO: See above.
+            // eslint-disable-next-line vue/no-mutating-props
             this.target.splice(index, 1);
         },
         moveUp(value) {
diff --git a/client/src/components/RuleBuilder/RuleComponent.vue b/client/src/components/RuleBuilder/RuleComponent.vue
index 474e6cbc4a4..c3cd50e34bf 100644
--- a/client/src/components/RuleBuilder/RuleComponent.vue
+++ b/client/src/components/RuleBuilder/RuleComponent.vue
@@ -32,7 +32,7 @@ export default {
     },
     methods: {
         cancel() {
-            this.builder.displayRuleType = null;
+            this.$emit("update:displayRuleType", null);
         },
         okay() {
             this.builder.handleRuleSave(this.ruleType);
diff --git a/client/src/components/RuleCollectionBuilder.vue b/client/src/components/RuleCollectionBuilder.vue
index 0049c8c3586..5d3d88876ac 100644
--- a/client/src/components/RuleCollectionBuilder.vue
+++ b/client/src/components/RuleCollectionBuilder.vue
@@ -23,10 +23,19 @@
             <b>Be sure to specify at least one column as a list identifier</b> - specify more to created nested list
             structures. Specify a column to serve as "collection name" to group datasets into multiple collections.
         </rule-modal-header>
+        <b-alert class="alert-area" v-if="validityErrorMessages.length != 0" show variant="warning" dismissible>
+            {{ validityErrorHeader }}
+            <ul>
+                <li v-for="error in validityErrorMessages" :key="error">
+                    {{ error }}
+                </li>
+            </ul>
+        </b-alert>
         <rule-modal-middle v-if="ruleView == 'source'">
             <p class="errormessagelarge" v-if="ruleSourceError">{{ ruleSourceError }}</p>
             <textarea class="rule-source" v-model="ruleSource"></textarea>
         </rule-modal-middle>
+
         <rule-modal-middle v-else>
             <!-- column-headers -->
             <div
@@ -44,7 +53,7 @@
                             'rules-container-full': initialElements == null,
                         }"
                     >
-                        <rule-component rule-type="sort" :display-rule-type="displayRuleType" :builder="this">
+                        <rule-component rule-type="sort" :displayRuleType.sync="displayRuleType" :builder="this">
                             <column-selector :target.sync="addSortingTarget" :col-headers="activeRuleColHeaders" />
                             <label v-b-tooltip.hover :title="titleNumericSort">
                                 <input type="checkbox" v-model="addSortingNumeric" />
@@ -53,7 +62,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_basename"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector
@@ -63,7 +72,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_rownum"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <label>
@@ -73,7 +82,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_metadata"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <label>
@@ -86,7 +95,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_group_tag_value"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <label>
@@ -100,7 +109,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_regex"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector :target.sync="addColumnRegexTarget" :col-headers="activeRuleColHeaders" />
@@ -131,7 +140,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_concatenate"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector
@@ -145,7 +154,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_substr"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector :target.sync="addColumnSubstrTarget" :col-headers="activeRuleColHeaders" />
@@ -164,7 +173,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_column_value"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <label>
@@ -172,14 +181,22 @@
                                 <input type="text" v-model="addColumnValue" />
                             </label>
                         </rule-component>
-                        <rule-component rule-type="remove_columns" :display-rule-type="displayRuleType" :builder="this">
+                        <rule-component
+                            rule-type="remove_columns"
+                            :displayRuleType.sync="displayRuleType"
+                            :builder="this"
+                        >
                             <column-selector
                                 :target.sync="removeColumnTargets"
                                 :col-headers="activeRuleColHeaders"
                                 :multiple="true"
                             />
                         </rule-component>
-                        <rule-component rule-type="split_columns" :display-rule-type="displayRuleType" :builder="this">
+                        <rule-component
+                            rule-type="split_columns"
+                            :displayRuleType.sync="displayRuleType"
+                            :builder="this"
+                        >
                             <column-selector
                                 :target.sync="splitColumnsTargets0"
                                 label="Odd Row Column(s)"
@@ -193,7 +210,11 @@
                                 :multiple="true"
                             />
                         </rule-component>
-                        <rule-component rule-type="swap_columns" :display-rule-type="displayRuleType" :builder="this">
+                        <rule-component
+                            rule-type="swap_columns"
+                            :displayRuleType.sync="displayRuleType"
+                            :builder="this"
+                        >
                             <column-selector
                                 :target.sync="swapColumnsTarget0"
                                 label="Swap Column"
@@ -207,7 +228,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_filter_regex"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector :target.sync="addFilterRegexTarget" :col-headers="activeRuleColHeaders" />
@@ -219,7 +240,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_filter_matches"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector
@@ -234,7 +255,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_filter_compare"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector
@@ -254,7 +275,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_filter_count"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <label>
@@ -275,7 +296,7 @@
                         </rule-component>
                         <rule-component
                             rule-type="add_filter_empty"
-                            :display-rule-type="displayRuleType"
+                            :displayRuleType.sync="displayRuleType"
                             :builder="this"
                         >
                             <column-selector :target.sync="addFilterEmptyTarget" :col-headers="activeRuleColHeaders" />
@@ -350,7 +371,7 @@
                                 <saved-rules-selector
                                     ref="savedRulesSelector"
                                     @update-rules="restoreRules"
-                                    :savedRules="this.savedRules"
+                                    :saved-rules="this.savedRules"
                                 />
                             </span>
                             <div v-if="jaggedData" class="rule-warning">
@@ -468,7 +489,7 @@
                 </div>
                 <!--  flex-column column -->
                 <!--  style="width: 70%;" -->
-                <div class="table-column" :class="orientation" style="width: 100%;" v-if="initialElements !== null">
+                <div class="table-column" :class="orientation" style="width: 100%" v-if="initialElements !== null">
                     <hot-table
                         id="hot-table"
                         ref="hotTable"
@@ -762,6 +783,7 @@ export default {
             hideSourceItems: this.defaultHideSourceItems,
             addNameTag: false,
             orientation: orientation,
+            validityErrorHeader: _l("These issues must be resolved to proceed:"),
         };
     },
     props: {
@@ -815,6 +837,9 @@ export default {
         },
     },
     computed: {
+        returnValidityErrorMessages: function () {
+            return this.validityErrorMessages;
+        },
         exisistingDatasets() {
             const elementsType = this.elementsType;
             return (
@@ -840,7 +865,9 @@ export default {
             return this.importType == "collections" && this.elementsType != "collection_contents";
         },
         titleFinish() {
-            if (this.elementsType == "datasets" || this.elementsType == "library_datasets") {
+            if (this.validityErrorMessages.length != 0) {
+                return _l("Button is disabled due to validation errors. Please see alerts above.");
+            } else if (this.elementsType == "datasets" || this.elementsType == "library_datasets") {
                 return _l("Create new collection from specified rules and datasets");
             } else if (this.elementsType == "collection_contents") {
                 return _l("Save rules and return to tool form");
@@ -1001,39 +1028,82 @@ export default {
             }
             return collectionType;
         },
-        validInput() {
-            const identifierColumns = this.identifierColumns();
-            const mappingAsDict = this.mappingAsDict;
+        validName() {
+            let valid = true;
             const buildingCollection = this.importType == "collections";
+            const mappingAsDict = this.mappingAsDict;
             const requiresName =
                 buildingCollection && this.elementsType != "collection_contents" && !mappingAsDict.collection_name;
-
-            let valid = true;
             if (requiresName) {
                 valid = this.collectionName.length > 0;
             }
-
-            if (mappingAsDict.ftp_path && mappingAsDict.url) {
-                // Can only specify one of these.
-                valid = false;
-            }
-
-            const requiresSourceColumn =
-                this.elementsType == "ftp" || this.elementsType == "raw" || this.elementsType == "remote_files";
-            if (requiresSourceColumn && !mappingAsDict.ftp_path && !mappingAsDict.url) {
-                valid = false;
-            }
+            return valid;
+        },
+        validRules() {
+            let valid = true;
             for (const rule of this.rules) {
                 if (rule.error) {
                     valid = false;
                 }
             }
-
+            return valid;
+        },
+        validOnlyOnePath() {
+            let valid = true;
+            const mappingAsDict = this.mappingAsDict;
+            if (mappingAsDict.ftp_path && mappingAsDict.url) {
+                // Can only specify one of these.
+                valid = false;
+            }
+            return valid;
+        },
+        validSourceColumn() {
+            let valid = true;
+            const mappingAsDict = this.mappingAsDict;
+            const requiresSourceColumn =
+                this.elementsType == "ftp" || this.elementsType == "raw" || this.elementsType == "remote_files";
+            if (requiresSourceColumn && !mappingAsDict.ftp_path && !mappingAsDict.url) {
+                valid = false;
+            }
+            return valid;
+        },
+        validIdentifierColumns() {
+            let valid = true;
+            const identifierColumns = this.identifierColumns();
+            const buildingCollection = this.importType == "collections";
             if (buildingCollection && identifierColumns.length == 0) {
                 valid = false;
             }
             return valid;
         },
+        validInput() {
+            return (
+                this.validName &&
+                this.validRules &&
+                this.validOnlyOnePath &&
+                this.validSourceColumn &&
+                this.validIdentifierColumns
+            );
+        },
+        validityErrorMessages() {
+            const messages = [];
+            if (!this.validName) {
+                messages.push("Name the collection.");
+            }
+            if (!this.validRules) {
+                messages.push("There is an error with one of your rules.");
+            }
+            if (!this.validOnlyOnePath) {
+                messages.push("Only specify either an FTP Path or a URL.");
+            }
+            if (!this.validSourceColumn) {
+                messages.push("Specify a source column (either FTP Path or URL).");
+            }
+            if (!this.validIdentifierColumns) {
+                messages.push("Specify a column as a list identifier.");
+            }
+            return messages;
+        },
         hotData() {
             let data;
             let sources;
@@ -1853,4 +1923,8 @@ export default {
 .menu-option {
     padding-left: 5px;
 }
+.alert-area li {
+    list-style: circle;
+    margin-left: 32px;
+}
 </style>
diff --git a/client/src/components/Tags/Tags.vue b/client/src/components/Tags/Tags.vue
index 9966e71d0ca..5c533d03535 100644
--- a/client/src/components/Tags/Tags.vue
+++ b/client/src/components/Tags/Tags.vue
@@ -84,6 +84,8 @@ export default {
         // object which is subscribed to above
 
         updateTagSearch(searchTxt) {
+            // TODO: Rework tagService prop mutation
+            // eslint-disable-next-line vue/no-mutating-props
             this.tagService.autocompleteSearchText = searchTxt;
         },
 
diff --git a/client/src/components/Tool/ToolFooter.vue b/client/src/components/Tool/ToolFooter.vue
index 9c049bb4d73..22d097f2704 100644
--- a/client/src/components/Tool/ToolFooter.vue
+++ b/client/src/components/Tool/ToolFooter.vue
@@ -6,7 +6,7 @@
                 v-b-tooltip.hover
                 title="Copy all citations as BibTeX"
                 icon="copy"
-                style="cursor: pointer;"
+                style="cursor: pointer"
                 @click="copyBibtex"
             />
             <Citation
@@ -32,7 +32,7 @@
         </div>
         <div class="mb-1" v-if="hasLicense">
             <span class="font-weight-bold">License:</span>
-            <License :licenseId="license" />
+            <License :license-id="license" />
         </div>
         <div v-if="hasReferences" class="mb-1">
             <span class="font-weight-bold">References:</span>
diff --git a/client/src/components/ToolEntryPoints/ToolEntryPoints.vue b/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
index 9b42f83b35d..73f9ad449ad 100644
--- a/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
+++ b/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
@@ -1,8 +1,6 @@
 <template>
     <div class="infomessagelarge">
-        <p v-if="entryPoints.length == 0">
-            Waiting for InteractiveTool result view(s) to become available.
-        </p>
+        <p v-if="entryPoints.length == 0">Waiting for InteractiveTool result view(s) to become available.</p>
         <p v-else-if="entryPoints.length == 1">
             <span v-if="entryPoints[0].active">
                 There is an InteractiveTool result view available,
@@ -18,9 +16,7 @@
                 <li v-for="entryPoint of entryPoints" :key="entryPoint.id">
                     {{ entryPoint.name }}
                     <span v-if="entryPoint.active"> (<a :href="entryPoint.target">click here to display</a>) </span>
-                    <span v-else>
-                        (waiting to become active...)
-                    </span>
+                    <span v-else> (waiting to become active...) </span>
                 </li>
             </ul>
         </div>
diff --git a/client/src/components/ToolsView/ToolsView.vue b/client/src/components/ToolsView/ToolsView.vue
index 69df1a8d18b..c338a66a445 100644
--- a/client/src/components/ToolsView/ToolsView.vue
+++ b/client/src/components/ToolsView/ToolsView.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-infinite-scroll="loadMore" infinite-scroll-disabled="busy">
-        <h2 class="mb-3" style="text-align: center;">
+        <h2 class="mb-3" style="text-align: center">
             <span id="tools-view">Consolidated view of {{ tools.length }} available tools.</span>
         </h2>
         <div v-if="!loading">
@@ -27,10 +27,10 @@
                 ref="iso"
                 :options="isoOptions"
                 :list="buffer"
-                style="margin: 0 auto;"
+                style="margin: 0 auto"
                 @filter="filterOption = arguments[2]"
             >
-                <b-card v-for="(info, index) in buffer" :key="index" ref="cards" class="m-2" style="width: 23rem;">
+                <b-card v-for="(info, index) in buffer" :key="index" ref="cards" class="m-2" style="width: 23rem">
                     <template v-slot:header>
                         <div>
                             <b-link :href="info.url" target="_blank">
diff --git a/client/src/components/Toolshed/InstalledList/Monitor.vue b/client/src/components/Toolshed/InstalledList/Monitor.vue
index f2f918115f0..7c7a97349ce 100644
--- a/client/src/components/Toolshed/InstalledList/Monitor.vue
+++ b/client/src/components/Toolshed/InstalledList/Monitor.vue
@@ -24,9 +24,7 @@
                 </template>
             </b-table>
         </b-card>
-        <b-alert v-if="showEmpty" variant="info" show>
-            Currently there are no installing repositories.
-        </b-alert>
+        <b-alert v-if="showEmpty" variant="info" show> Currently there are no installing repositories. </b-alert>
     </div>
 </template>
 <script>
diff --git a/client/src/components/Toolshed/RepositoryDetails/InstallationButton.vue b/client/src/components/Toolshed/RepositoryDetails/InstallationButton.vue
index aebfbd8b2e3..6a0b84d1dd0 100644
--- a/client/src/components/Toolshed/RepositoryDetails/InstallationButton.vue
+++ b/client/src/components/Toolshed/RepositoryDetails/InstallationButton.vue
@@ -1,8 +1,6 @@
 <template>
     <div>
-        <b-button v-if="installState" :class="buttonClass" variant="primary" @click="onInstall">
-            Install
-        </b-button>
+        <b-button v-if="installState" :class="buttonClass" variant="primary" @click="onInstall"> Install </b-button>
         <div v-else>
             <b-button v-if="uninstallState" :class="buttonClass" variant="danger" @click="onUninstall">
                 Uninstall
diff --git a/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.vue b/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.vue
index abb45ac90be..a4c6cf163dd 100644
--- a/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.vue
+++ b/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.vue
@@ -41,9 +41,7 @@
                     <b-form-checkbox v-model="installRepositoryDependencies">
                         Install repository dependencies
                     </b-form-checkbox>
-                    <b-form-checkbox v-model="installToolDependencies">
-                        Install tool dependencies
-                    </b-form-checkbox>
+                    <b-form-checkbox v-model="installToolDependencies"> Install tool dependencies </b-form-checkbox>
                 </b-form-group>
             </b-card>
         </b-collapse>
diff --git a/client/src/components/Toolshed/SearchList/Repositories.vue b/client/src/components/Toolshed/SearchList/Repositories.vue
index d224337b5bd..4f9bdfa5140 100644
--- a/client/src/components/Toolshed/SearchList/Repositories.vue
+++ b/client/src/components/Toolshed/SearchList/Repositories.vue
@@ -11,9 +11,7 @@
                 <RepositoryDetails :repo="row.item" :toolshed-url="toolshedUrl" />
             </template>
         </b-table>
-        <div class="unavailable-message" v-if="noResultsFound">
-            No matching repositories found.
-        </div>
+        <div class="unavailable-message" v-if="noResultsFound">No matching repositories found.</div>
         <loading-span v-if="pageLoading" message="Loading repositories" />
     </div>
 </template>
diff --git a/client/src/components/Upload/Collection.vue b/client/src/components/Upload/Collection.vue
index a35be991f5e..9dc2f04474b 100644
--- a/client/src/components/Upload/Collection.vue
+++ b/client/src/components/Upload/Collection.vue
@@ -129,6 +129,7 @@ export default {
     components: { BButton },
     data() {
         return {
+            uploadUrl: null,
             topInfo: "",
             showHelper: true,
             extension: this.app.defaultExtension,
@@ -168,7 +169,12 @@ export default {
         this.initFtpPopover();
         // file upload
         this.initUploadbox({
-            url: this.app.uploadPath,
+            initUrl: (index) => {
+                if (!this.uploadUrl) {
+                    this.uploadUrl = this.getRequestUrl([this.collection.get(index)], this.history_id);
+                }
+                return this.uploadUrl;
+            },
             announce: (index, file) => {
                 this._eventAnnounce(index, file);
             },
diff --git a/client/src/components/Upload/Composite.vue b/client/src/components/Upload/Composite.vue
index 30f6ceca70e..dbb6a539828 100644
--- a/client/src/components/Upload/Composite.vue
+++ b/client/src/components/Upload/Composite.vue
@@ -141,7 +141,7 @@ export default {
             });
             $.uploadpost({
                 url: this.app.uploadPath,
-                data: this.app.toData(this.collection.filter()),
+                data: this.app.toFileUploadData(this.collection.filter()),
                 success: (message) => {
                     this._eventSuccess(message);
                 },
diff --git a/client/src/components/Upload/Default.vue b/client/src/components/Upload/Default.vue
index 6c2986d6ee9..b73cefdf61e 100644
--- a/client/src/components/Upload/Default.vue
+++ b/client/src/components/Upload/Default.vue
@@ -128,6 +128,7 @@ export default {
     },
     data() {
         return {
+            uploadUrl: null,
             topInfo: "",
             highlightBox: false,
             showHelper: true,
@@ -164,7 +165,12 @@ export default {
         this.initFtpPopover();
         // file upload
         this.initUploadbox({
-            url: this.app.uploadPath,
+            initUrl: (index) => {
+                if (!this.uploadUrl) {
+                    this.uploadUrl = this.getRequestUrl([this.collection.get(index)], this.history_id);
+                }
+                return this.uploadUrl;
+            },
             multiple: this.multiple,
             announce: (index, file) => {
                 this._eventAnnounce(index, file);
diff --git a/client/src/components/Upload/RulesInput.vue b/client/src/components/Upload/RulesInput.vue
index 868f07614be..79009aa76a7 100644
--- a/client/src/components/Upload/RulesInput.vue
+++ b/client/src/components/Upload/RulesInput.vue
@@ -1,6 +1,6 @@
 <template>
     <upload-wrapper ref="wrapper" :top-info="topInfo | l">
-        <span style="width: 25%; display: inline; height: 100%;" class="float-left">
+        <span style="width: 25%; display: inline; height: 100%" class="float-left">
             <div class="upload-rule-option">
                 <div class="upload-rule-option-title">{{ "Upload data as" | l }}</div>
                 <div class="rule-data-type">
@@ -33,10 +33,10 @@
                 </div>
             </div>
         </span>
-        <span style="display: inline; float: right; width: 75%; height: 300px;">
+        <span style="display: inline; float: right; width: 75%; height: 300px">
             <textarea
                 class="upload-rule-source-content form-control"
-                style="height: 100%;"
+                style="height: 100%"
                 v-model="sourceContent"
                 :disabled="selectionType != 'paste'"
             ></textarea>
diff --git a/client/src/components/Upload/UploadBoxMixin.js b/client/src/components/Upload/UploadBoxMixin.js
index 626709de1b8..5a01be68728 100644
--- a/client/src/components/Upload/UploadBoxMixin.js
+++ b/client/src/components/Upload/UploadBoxMixin.js
@@ -10,6 +10,7 @@ import UploadFtp from "mvc/upload/upload-ftp";
 import LazyLimited from "mvc/lazy/lazy-limited";
 import { findExtension } from "./utils";
 import { filesDialog } from "utils/data";
+import { getAppRoot } from "onload";
 
 const localize = _l;
 
@@ -339,5 +340,10 @@ export default {
             const models = allHids.map((hid) => Galaxy.currHistoryPanel.collection.getByHid(hid));
             return models;
         },
+        getRequestUrl: function (items, history_id) {
+            var data = this.app.toData(items, history_id);
+            const appRoot = getAppRoot();
+            return data.fetchRequest ? `${appRoot}api/tools/fetch` : this.app.uploadPath;
+        },
     },
 };
diff --git a/client/src/components/Upload/UploadModalContent.vue b/client/src/components/Upload/UploadModalContent.vue
index 933af89118b..a1264e0a93b 100644
--- a/client/src/components/Upload/UploadModalContent.vue
+++ b/client/src/components/Upload/UploadModalContent.vue
@@ -60,6 +60,7 @@ export default {
             extensionsSet: false,
             datatypesMapper: null,
             datatypesMapperReady: true,
+            URI_PREFIXES: ["http", "https", "ftp", "file", "gxfiles", "gximport", "gxuserimport", "gxftp"],
         };
     },
     created() {
@@ -173,12 +174,44 @@ export default {
         currentFtp: function () {
             return this.currentUserId && this.ftpUploadSite;
         },
-
+        toData: function (items, history_id) {
+            const data = {
+                fetchRequest: null,
+                uploadRequest: null,
+            };
+            if (items && items.length > 0) {
+                const split = this.preprocess(items);
+                if (split.urls.length > 0) {
+                    data.fetchRequest = this.toFetchData(split.urls, history_id);
+                } else {
+                    data.uploadRequest = this.toFileUploadData(split.files, history_id);
+                }
+            }
+            return data;
+        },
+        preprocess: function (items) {
+            const data = {
+                urls: [],
+                files: [],
+            };
+            for (var index in items) {
+                var it = items[index];
+                if (it.get("file_mode") != "new" || !this.itemIsURL(it)) {
+                    data.files.push(it);
+                } else {
+                    data.urls.push(it);
+                }
+            }
+            return data;
+        },
+        itemIsURL: function (item) {
+            return this.URI_PREFIXES.some((prefix) => item.get("url_paste").startsWith(prefix));
+        },
         /**
          * Package API data from array of models
          * @param{Array} items - Upload items/rows filtered from a collection
          */
-        toData: function (items, history_id) {
+        toFileUploadData: function (items, history_id) {
             // create dictionary for data submission
             var data = {
                 payload: {
@@ -244,6 +277,38 @@ export default {
             }
             return data;
         },
+        toFetchData: function (items, history_id) {
+            var data = {
+                history_id: history_id,
+                space_to_tab: items[0].get("space_to_tab"),
+                to_posix_lines: items[0].get("to_posix_lines"),
+                targets: [
+                    {
+                        destination: { type: "hdas" },
+                        elements: [],
+                        name: "",
+                    },
+                ],
+                auto_decompress: true,
+            };
+
+            // Composite does not use the fetch API, so we can just
+            // index into the first element of items
+            const urls = items[0].get("url_paste").split("\n");
+            for (var index in urls) {
+                var url = urls[index].trim();
+                if (url != "") {
+                    var element = {
+                        url: urls[index].trim(),
+                        src: "url",
+                        dbkey: items[0].get("genome", "?"),
+                        ext: items[0].get("extension", "auto"),
+                    };
+                    data.targets[0].elements.push(element);
+                }
+            }
+            return data;
+        },
     },
 };
 </script>
diff --git a/client/src/components/User/CloudAuth/CloudAuth.vue b/client/src/components/User/CloudAuth/CloudAuth.vue
index 4eda41fb247..2aa4346c80c 100644
--- a/client/src/components/User/CloudAuth/CloudAuth.vue
+++ b/client/src/components/User/CloudAuth/CloudAuth.vue
@@ -60,9 +60,7 @@
             </transition>
 
             <b-button-group class="mb-4">
-                <button name="createNewKey" @click="onCreate">
-                    Create New Authorization Key
-                </button>
+                <button name="createNewKey" @click="onCreate">Create New Authorization Key</button>
             </b-button-group>
         </header>
 
diff --git a/client/src/components/User/CloudAuth/CloudAuthItem.vue b/client/src/components/User/CloudAuth/CloudAuthItem.vue
index dc7a13d3558..6f1982a73a0 100644
--- a/client/src/components/User/CloudAuth/CloudAuthItem.vue
+++ b/client/src/components/User/CloudAuth/CloudAuthItem.vue
@@ -41,7 +41,8 @@
                 </nav>
             </hgroup>
         </header>
-
+        <!-- TODO: Restructure credential handling so we're not mutating the prop -->
+        <!-- eslint-disable vue/no-mutating-props-->
         <credential-form
             v-if="expanded"
             class="border-top"
@@ -50,6 +51,7 @@
             @save="$emit('save', credential)"
             @delete="$emit('delete', credential)"
         />
+        <!-- eslint-enable vue/no-mutating-props-->
     </b-list-group-item>
 </template>
 
diff --git a/client/src/components/User/CloudAuth/CredentialForm.vue b/client/src/components/User/CloudAuth/CredentialForm.vue
index e27decdc2e5..ee8a1901cf1 100644
--- a/client/src/components/User/CloudAuth/CredentialForm.vue
+++ b/client/src/components/User/CloudAuth/CredentialForm.vue
@@ -39,9 +39,7 @@
         <credential-config v-model="credential.config" />
 
         <footer class="border-top">
-            <b-button variant="secondary" @click.prevent="$emit('delete', credential)">
-                Delete Key
-            </b-button>
+            <b-button variant="secondary" @click.prevent="$emit('delete', credential)"> Delete Key </b-button>
             <b-button
                 aria-label="Save Key"
                 :variant="saveButtonVariant"
diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
index fde374718ac..3e14930fe7c 100644
--- a/client/src/components/User/UserPreferences.vue
+++ b/client/src/components/User/UserPreferences.vue
@@ -32,43 +32,43 @@
                 </div>
             </div>
         </b-row>
-        <b-row class="ml-3 mb-1">
-            <i class="pref-icon pt-1 fa fa-lg fa-radiation" />
-            <div class="pref-content pr-1">
-                <a href="javascript:void(0)"><b v-b-modal.modal-prevent-closing>Delete Account</b></a>
-                <div class="form-text text-muted">
-                    Delete your account on this Galaxy server.
+        <ConfigProvider v-slot="{ config }">
+            <b-row v-if="config && !config.single_user" class="ml-3 mb-1">
+                <i class="pref-icon pt-1 fa fa-lg fa-radiation" />
+                <div class="pref-content pr-1">
+                    <a href="javascript:void(0)"><b v-b-modal.modal-prevent-closing>Delete Account</b></a>
+                    <div class="form-text text-muted">Delete your account on this Galaxy server.</div>
+                    <b-modal
+                        id="modal-prevent-closing"
+                        centered
+                        ref="modal"
+                        title="Account Deletion"
+                        title-tag="h2"
+                        @show="resetModal"
+                        @hidden="resetModal"
+                        @ok="handleOk"
+                    >
+                        <p>
+                            <b-alert variant="danger" :show="showDeleteError">{{ deleteError }}</b-alert>
+                            <b>
+                                This action cannot be undone. Your account will be permanently deleted, along with the
+                                data contained in it.
+                            </b>
+                        </p>
+                        <b-form ref="form" @submit.prevent="handleSubmit">
+                            <b-form-group
+                                :state="nameState"
+                                label="Enter your user email for this account as confirmation."
+                                label-for="Email"
+                                invalid-feedback="Incorrect email"
+                            >
+                                <b-form-input id="name-input" v-model="name" :state="nameState" required></b-form-input>
+                            </b-form-group>
+                        </b-form>
+                    </b-modal>
                 </div>
-                <b-modal
-                    id="modal-prevent-closing"
-                    centered
-                    ref="modal"
-                    title="Account Deletion"
-                    title-tag="h2"
-                    @show="resetModal"
-                    @hidden="resetModal"
-                    @ok="handleOk"
-                >
-                    <p>
-                        <b-alert variant="danger" :show="showDeleteError">{{ deleteError }}</b-alert>
-                        <b>
-                            This action cannot be undone. Your account will be permanently deleted, along with the data
-                            contained in it.
-                        </b>
-                    </p>
-                    <b-form ref="form" @submit.prevent="handleSubmit">
-                        <b-form-group
-                            :state="nameState"
-                            label="Enter your user email for this account as confirmation."
-                            label-for="Email"
-                            invalid-feedback="Incorrect email"
-                        >
-                            <b-form-input id="name-input" v-model="name" :state="nameState" required></b-form-input>
-                        </b-form-group>
-                    </b-form>
-                </b-modal>
-            </div>
-        </b-row>
+            </b-row>
+        </ConfigProvider>
         <p class="mt-2">
             You are using <strong>{{ diskUsage }}</strong> of disk space in this Galaxy instance.
             <span v-html="quotaUsageString"></span>
@@ -88,6 +88,7 @@ import _l from "utils/localization";
 import axios from "axios";
 import QueryStringParsing from "utils/query-string-parsing";
 import { getUserPreferencesModel } from "components/User/UserPreferencesModel";
+import ConfigProvider from "components/providers/ConfigProvider";
 import { userLogoutAll, userLogoutClient } from "layout/menu";
 import "@fortawesome/fontawesome-svg-core";
 
@@ -104,6 +105,9 @@ export default {
             required: true,
         },
     },
+    components: {
+        ConfigProvider,
+    },
     data() {
         return {
             email: "",
diff --git a/client/src/components/User/UserPreferencesModel.js b/client/src/components/User/UserPreferencesModel.js
index c5800180134..16e69b87847 100644
--- a/client/src/components/User/UserPreferencesModel.js
+++ b/client/src/components/User/UserPreferencesModel.js
@@ -42,12 +42,14 @@ export const getUserPreferencesModel = () => {
             icon: "fa-users",
             submit_title: "Save Permissions",
             redirect: "user",
+            shouldRender: !config.single_user,
         },
         make_data_private: {
             title: _l("Make All Data Private"),
             id: "edit-preferences-make-data-private",
             description: _l("Click here to make all data private."),
             icon: "fa-lock",
+            shouldRender: !config.single_user,
         },
         api_key: {
             title: _l("Manage API Key"),
@@ -86,7 +88,7 @@ export const getUserPreferencesModel = () => {
             id: "edit-preferences-sign-out",
             description: _l("Click here to sign out of all sessions."),
             icon: "fa-sign-out",
-            shouldRender: !!Galaxy.session_csrf_token,
+            shouldRender: !!Galaxy.session_csrf_token && !config.single_user,
         },
     };
 };
diff --git a/client/src/components/Workflow/Editor/Attributes.vue b/client/src/components/Workflow/Editor/Attributes.vue
index 202c77c9403..1c3a8e592e4 100644
--- a/client/src/components/Workflow/Editor/Attributes.vue
+++ b/client/src/components/Workflow/Editor/Attributes.vue
@@ -32,13 +32,11 @@
                 v-model="annotationCurrent"
                 @keyup="$emit('update:annotationCurrent', annotationCurrent)"
             />
-            <div class="form-text text-muted">
-                These notes will be visible when this workflow is viewed.
-            </div>
+            <div class="form-text text-muted">These notes will be visible when this workflow is viewed.</div>
         </div>
         <div id="workflow-license-area" class="mt-2">
             <b>License</b>
-            <LicenseSelector :inputLicense="license" @onLicense="onLicense" />
+            <LicenseSelector :input-license="license" @onLicense="onLicense" />
         </div>
         <div id="workflow-creator-area" class="mt-2">
             <b>Creator</b>
diff --git a/client/src/components/Workflow/Editor/Index.test.js b/client/src/components/Workflow/Editor/Index.test.js
index 4d9d2f470e1..c33c647deae 100644
--- a/client/src/components/Workflow/Editor/Index.test.js
+++ b/client/src/components/Workflow/Editor/Index.test.js
@@ -39,7 +39,7 @@ describe("Index", () => {
         wrapper = shallowMount(Index, {
             propsData: {
                 id: "workflow_id",
-                version: 1,
+                initialVersion: 1,
                 tags: ["moo", "cow"],
                 moduleSections: [],
                 dataManagers: [],
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index a7b5aa55eaa..23b31e6ea4c 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -1,14 +1,14 @@
 <template>
     <div id="columns" class="workflow-client">
-        <StateUpgradeModal :stateMessages="stateMessages" />
+        <StateUpgradeModal :state-messages="stateMessages" />
         <StateUpgradeModal
-            :stateMessages="insertedStateMessages"
+            :state-messages="insertedStateMessages"
             title="Subworkflow embedded with changes"
             message="Problems were encountered loading this workflow (possibly a result of tool upgrades). Please review the following parameters and then save."
         />
         <RefactorConfirmationModal
-            :workflowId="id"
-            :refactorActions="refactorActions"
+            :workflow-id="id"
+            :refactor-actions="refactorActions"
             @onWorkflowError="onWorkflowError"
             @onWorkflowMessage="onWorkflowMessage"
             @onRefactor="onRefactor"
@@ -99,7 +99,7 @@
                         <div class="unified-panel-header" unselectable="on">
                             <div class="unified-panel-header-inner">
                                 <WorkflowOptions
-                                    :hasChanges="hasChanges"
+                                    :has-changes="hasChanges"
                                     @onSave="onSave"
                                     @onSaveAs="onSaveAs"
                                     @onRun="onRun"
@@ -119,9 +119,9 @@
                                     :id="id"
                                     :tags="tags"
                                     :parameters="parameters"
-                                    :annotationCurrent.sync="annotation"
+                                    :annotation-current.sync="annotation"
                                     :annotation="annotation"
-                                    :nameCurrent.sync="name"
+                                    :name-current.sync="name"
                                     :name="name"
                                     :version="version"
                                     :versions="versions"
@@ -135,7 +135,7 @@
                                     id="lint-panel"
                                     class="right-content"
                                     ref="lint"
-                                    style="display: none;"
+                                    style="display: none"
                                     :untyped-parameters="parameters"
                                     :annotation="annotation"
                                     :creator="creator"
@@ -206,7 +206,7 @@ export default {
             type: String,
             required: true,
         },
-        version: {
+        initialVersion: {
             type: Number,
             required: true,
         },
@@ -259,6 +259,7 @@ export default {
             messageTitle: null,
             messageBody: null,
             messageIsError: false,
+            version: this.initialVersion,
         };
     },
     created() {
diff --git a/client/src/components/Workflow/Editor/Lint.test.js b/client/src/components/Workflow/Editor/Lint.test.js
index 31f98bf874c..e0857b5ef41 100644
--- a/client/src/components/Workflow/Editor/Lint.test.js
+++ b/client/src/components/Workflow/Editor/Lint.test.js
@@ -8,7 +8,7 @@ jest.mock("app");
 const localVue = getLocalVue();
 
 const nodes = {
-    "1": {
+    1: {
         id: "1",
         title: "node_title",
         label: "",
@@ -42,7 +42,7 @@ const nodes = {
             },
         },
     },
-    "2": {
+    2: {
         id: "2",
         title: "",
         label: "",
diff --git a/client/src/components/Workflow/Editor/Lint.vue b/client/src/components/Workflow/Editor/Lint.vue
index 90a5a406466..580c04489c5 100644
--- a/client/src/components/Workflow/Editor/Lint.vue
+++ b/client/src/components/Workflow/Editor/Lint.vue
@@ -6,9 +6,7 @@
                 Best Practices Review
             </div>
             <div v-if="showRefactor">
-                <a href="#" @click="onRefactor">
-                    Try to automatically fix issues.
-                </a>
+                <a href="#" @click="onRefactor"> Try to automatically fix issues. </a>
             </div>
         </template>
         <b-card-body>
diff --git a/client/src/components/Workflow/Editor/MessagesModal.vue b/client/src/components/Workflow/Editor/MessagesModal.vue
index e42973f32e5..87e403d7f9e 100644
--- a/client/src/components/Workflow/Editor/MessagesModal.vue
+++ b/client/src/components/Workflow/Editor/MessagesModal.vue
@@ -14,7 +14,7 @@
         <div class="workflow-message-modal">
             <div v-if="message == 'progress'">
                 <div class="progress progress-striped active">
-                    <div class="progress-bar" style="width: 100%;"></div>
+                    <div class="progress-bar" style="width: 100%"></div>
                 </div>
             </div>
             <div v-else>
diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue
index 4b1600c591e..26a401f7683 100644
--- a/client/src/components/Workflow/Editor/Node.vue
+++ b/client/src/components/Workflow/Editor/Node.vue
@@ -243,15 +243,22 @@ export default {
         },
         onAddInput(input, terminal) {
             this.inputTerminals[input.name] = terminal;
+            this.onRedraw();
         },
         onRemoveInput(input) {
             delete this.inputTerminals[input.name];
+            this.onRedraw();
         },
         onAddOutput(output, terminal) {
+            if (this.mapOver) {
+                terminal.setMapOver(this.mapOver);
+            }
             this.outputTerminals[output.name] = terminal;
+            this.onRedraw();
         },
         onRemoveOutput(output) {
             delete this.outputTerminals[output.name];
+            this.onRedraw();
         },
         onToggleOutput(name) {
             this.activeOutputs.toggle(name);
diff --git a/client/src/components/Workflow/Editor/NodeInput.vue b/client/src/components/Workflow/Editor/NodeInput.vue
index 402af4760e1..d9b82fa6073 100644
--- a/client/src/components/Workflow/Editor/NodeInput.vue
+++ b/client/src/components/Workflow/Editor/NodeInput.vue
@@ -107,7 +107,6 @@ export default {
             this.$emit("onChange");
         },
         onRemove() {
-            this.$emit("onRemove", this.input);
             this.terminal.destroy();
         },
         mouseOver(e) {
@@ -120,6 +119,7 @@ export default {
         },
     },
     beforeDestroy() {
+        this.$emit("onRemove", this.input);
         this.onRemove();
     },
 };
diff --git a/client/src/components/Workflow/Editor/ReportHelp.vue b/client/src/components/Workflow/Editor/ReportHelp.vue
index 8d778e51429..556b5a39208 100644
--- a/client/src/components/Workflow/Editor/ReportHelp.vue
+++ b/client/src/components/Workflow/Editor/ReportHelp.vue
@@ -39,9 +39,7 @@ job_parameters(step="qc")
 ```
 </pre
         >
-        <p>
-            It is also possible to reference a single job parameter
-        </p>
+        <p>It is also possible to reference a single job parameter</p>
 
         <pre>
 ```galaxy
diff --git a/client/src/components/Workflow/Editor/modules/forms.js b/client/src/components/Workflow/Editor/modules/forms.js
index f7256bcfc6d..a0137247152 100644
--- a/client/src/components/Workflow/Editor/modules/forms.js
+++ b/client/src/components/Workflow/Editor/modules/forms.js
@@ -108,8 +108,8 @@ export class ToolForm {
         const inputs = node.config_form.inputs;
         Utils.deepeach(inputs, (input) => {
             if (input.type) {
-                if (["data", "data_collection", "hidden"].indexOf(input.type) != -1) {
-                    input.type = "hidden";
+                if (["data", "data_collection"].indexOf(input.type) != -1) {
+                    input.hiddenInWorkflow = true;
                     input.info = `Data input '${input.name}' (${Utils.textify(input.extensions)})`;
                     input.value = { __class__: "RuntimeValue" };
                 } else if (!input.fixed) {
diff --git a/client/src/components/Workflow/Editor/modules/terminals.js b/client/src/components/Workflow/Editor/modules/terminals.js
index 9e2fab488d3..e7b1a79b82a 100644
--- a/client/src/components/Workflow/Editor/modules/terminals.js
+++ b/client/src/components/Workflow/Editor/modules/terminals.js
@@ -157,6 +157,7 @@ class Terminal extends EventEmitter {
         }
         if (!this.mapOver.equal(val)) {
             this.mapOver = val;
+            this.node.mapOver = output_val;
             Object.values(this.node.outputTerminals).forEach((outputTerminal) => {
                 outputTerminal.setMapOver(output_val);
             });
diff --git a/client/src/components/Workflow/TrsSearch.vue b/client/src/components/Workflow/TrsSearch.vue
index f97aa9aa0b4..0714167d933 100644
--- a/client/src/components/Workflow/TrsSearch.vue
+++ b/client/src/components/Workflow/TrsSearch.vue
@@ -26,9 +26,7 @@
             <b-alert v-if="searching" variant="info" show>
                 Searching for {{ searchingFor }}, this may take a while - please be patient.
             </b-alert>
-            <b-alert v-else-if="newSearch" variant="info" show>
-                Enter search query to begin search.
-            </b-alert>
+            <b-alert v-else-if="newSearch" variant="info" show> Enter search query to begin search. </b-alert>
             <b-alert v-else-if="results.length == 0" variant="info" show>
                 No search results found, refine your search.
             </b-alert>
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index c2d34acbd3f..c6985bbf017 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -77,9 +77,7 @@
                     No matching entries found for: <span class="font-weight-bold">{{ this.filter }}</span
                     >.
                 </div>
-                <div v-if="showNotAvailable">
-                    No workflows found. You may create or import new workflows.
-                </div>
+                <div v-if="showNotAvailable">No workflows found. You may create or import new workflows.</div>
             </div>
         </div>
     </div>
diff --git a/client/src/components/WorkflowInvocationState/DatasetCollectionContents.vue b/client/src/components/WorkflowInvocationState/DatasetCollectionContents.vue
index 08ee70deb24..9e4524df769 100644
--- a/client/src/components/WorkflowInvocationState/DatasetCollectionContents.vue
+++ b/client/src/components/WorkflowInvocationState/DatasetCollectionContents.vue
@@ -1,13 +1,10 @@
 <template>
     <div>
-        <div v-for="contentItem in collectionContents" :index="1" :key="contentItem.id" style="margin-left: 2em;">
+        <div v-for="contentItem in collectionContents" :index="1" :key="contentItem.id" style="margin-left: 2em">
             <DatasetProvider
                 v-if="contentItem.element_type === 'hda'"
                 :id="contentItem.object.id"
-                v-slot="{
-                    item,
-                    loading,
-                }"
+                v-slot="{ item, loading }"
             >
                 <div>
                     <loading-span v-if="loading" message="Loading datasets" />
diff --git a/client/src/components/WorkflowInvocationState/DatasetCollectionUIWrapper.vue b/client/src/components/WorkflowInvocationState/DatasetCollectionUIWrapper.vue
index 4b054b1470f..b61e066bc2a 100644
--- a/client/src/components/WorkflowInvocationState/DatasetCollectionUIWrapper.vue
+++ b/client/src/components/WorkflowInvocationState/DatasetCollectionUIWrapper.vue
@@ -14,7 +14,7 @@
         />
         <DatasetCollectionContentProvider v-if="expand" :id="datasetCollection.contents_url" v-slot="{ item, loading }">
             <b-spinner v-if="loading">Loading Dataset Collection...</b-spinner>
-            <DatasetCollectionContents v-else :collectionContents="item" />
+            <DatasetCollectionContents v-else :collection-contents="item" />
         </DatasetCollectionContentProvider>
     </div>
 </template>
diff --git a/client/src/components/WorkflowInvocationState/JobStep.vue b/client/src/components/WorkflowInvocationState/JobStep.vue
index f01ef24f404..0a519709485 100644
--- a/client/src/components/WorkflowInvocationState/JobStep.vue
+++ b/client/src/components/WorkflowInvocationState/JobStep.vue
@@ -2,18 +2,12 @@
     <b-card v-if="jobs">
         <b-table small caption-top :items="jobsProvider" :fields="fields" primary-key="id" @row-clicked="toggleDetails">
             <template v-slot:row-details="row">
-                <job-provider
-                    :id="row.item.id"
-                    v-slot="{
-                        item,
-                        loading,
-                    }"
-                >
+                <job-provider :id="row.item.id" v-slot="{ item, loading }">
                     <div v-if="loading"><b-spinner label="Loading Job..."></b-spinner></div>
                     <div v-else>
                         <job-information :job_id="item.id" v-if="item" />
                         <p></p>
-                        <job-parameters v-if="item" :jobId="item.id" :includeTitle="false" />
+                        <job-parameters v-if="item" :job-id="item.id" :include-title="false" />
                     </div>
                 </job-provider>
             </template>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
index 931d07cbbc4..a21a1b26a6c 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
@@ -43,10 +43,10 @@
                 <workflow-invocation-step
                     v-for="step in Object.values(workflow.steps)"
                     :invocation="invocation"
-                    :orderedSteps="orderedSteps"
+                    :ordered-steps="orderedSteps"
                     :key="step.id"
                     :workflow="workflow"
-                    :workflowStep="step"
+                    :workflow-step="step"
                 />
             </details>
         </div>
@@ -114,7 +114,7 @@ export default {
                     complete: () => console.log("Invocation finished, stopping history dataset monitor"),
                 });
             }
-        }
+        },
     },
 };
 </script>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index 2c759605426..7ed90640a9d 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -61,7 +61,7 @@
         <workflow-invocation-details
             v-if="invocation"
             :invocation="invocation"
-            :invocationAndJobTerminal="invocationAndJobTerminal"
+            :invocation-and-job-terminal="invocationAndJobTerminal"
         />
     </div>
 </template>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
index 6b5793bf92d..683ab5e6510 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="d-flex" :data-step="workflowStep.id">
-        <div class="ui-portlet-section" style="width: 100%;">
-            <div class="portlet-header portlet-title portlet-operations" v-on:click="toggleStep">
+        <div class="ui-portlet-section" style="width: 100%">
+            <div class="portlet-header portlet-title portlet-operations" @click="toggleStep">
                 <i :class="'portlet-title-icon fa mr-1 ' + stepIcon"></i>
                 <span class="portlet-title-text">
                     <u class="step-title">{{ stepLabel }}</u>
@@ -13,13 +13,14 @@
                     :id="invocationStepId"
                     v-slot="{ item: stepDetails, loading }"
                 >
-                    <div style="min-width: 1;">
+                    <div style="min-width: 1">
                         <loading-span v-if="loading" :message="`Loading invocation step details`"> </loading-span>
                         <div v-else>
                             <details
                                 v-if="Object.values(stepDetails.outputs).length > 0"
                                 class="invocation-step-output-details"
-                                ><summary><b>Output Datasets</b></summary>
+                            >
+                                <summary><b>Output Datasets</b></summary>
                                 <div v-for="(value, name) in stepDetails.outputs" :key="value.id">
                                     <b>{{ name }}</b>
                                     <workflow-invocation-data-contents :data_item="value" />
@@ -28,13 +29,14 @@
                             <details
                                 v-if="Object.values(stepDetails.output_collections).length > 0"
                                 class="invocation-step-output-collection-details"
-                                ><summary><b>Output Dataset Collections</b></summary>
+                            >
+                                <summary><b>Output Dataset Collections</b></summary>
                                 <div v-for="(value, name) in stepDetails.output_collections" :key="value.id">
                                     <b>{{ name }}</b>
                                     <workflow-invocation-data-contents :data_item="value" />
                                 </div>
                             </details>
-                            <div class="portlet-body" style="width: 100%; overflow-x: auto;">
+                            <div class="portlet-body" style="width: 100%; overflow-x: auto">
                                 <details v-if="workflowStepType == 'tool'" class="invocation-step-job-details">
                                     <summary><b>Jobs</b></summary>
                                     <job-step :jobs="stepDetails.jobs" />
@@ -63,7 +65,7 @@
                                     </div>
                                     <workflow-invocation-state
                                         v-else
-                                        :invocationId="stepDetails.subworkflow_invocation_id"
+                                        :invocation-id="stepDetails.subworkflow_invocation_id"
                                     />
                                 </div>
                             </div>
diff --git a/client/src/components/admin/DataManagerGrid.vue b/client/src/components/admin/DataManagerGrid.vue
index 64b3f322172..bd100b63501 100644
--- a/client/src/components/admin/DataManagerGrid.vue
+++ b/client/src/components/admin/DataManagerGrid.vue
@@ -2,7 +2,7 @@
     <table class="tabletip">
         <thead>
             <tr>
-                <th :colspan="dataManagerColumns.length" style="font-size: 120%;">
+                <th :colspan="dataManagerColumns.length" style="font-size: 120%">
                     Data Manager: {{ dataManagerTableName }}
                     <a
                         class="icon-btn"
diff --git a/client/src/components/admin/Dependencies/ContainerResolutionDetails.vue b/client/src/components/admin/Dependencies/ContainerResolutionDetails.vue
index ccf79a6b248..0e88aafbc31 100644
--- a/client/src/components/admin/Dependencies/ContainerResolutionDetails.vue
+++ b/client/src/components/admin/Dependencies/ContainerResolutionDetails.vue
@@ -15,25 +15,19 @@
             </div>
         </div>
         <div class="row">
-            <div class="col">
-                Requirements
-            </div>
+            <div class="col">Requirements</div>
             <div class="col-8">
                 <requirements :requirements="resolution.requirements" />
             </div>
         </div>
         <div class="row">
-            <div class="col">
-                Status Display
-            </div>
+            <div class="col">Status Display</div>
             <div class="col-8">
                 <status-display :status="resolution.status" :compact="false" />
             </div>
         </div>
         <div class="row">
-            <div class="col">
-                Container
-            </div>
+            <div class="col">Container</div>
             <div class="col-8">
                 <container-description
                     :container-description="resolution.status.container_description"
@@ -42,9 +36,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col">
-                Container Resolver
-            </div>
+            <div class="col">Container Resolver</div>
             <div class="col-8">
                 <container-resolver :container-resolver="resolution.status.container_resolver" :compact="false" />
             </div>
diff --git a/client/src/components/admin/Dependencies/DependencyResolver.vue b/client/src/components/admin/Dependencies/DependencyResolver.vue
index eb8820565a1..d4578f25d19 100644
--- a/client/src/components/admin/Dependencies/DependencyResolver.vue
+++ b/client/src/components/admin/Dependencies/DependencyResolver.vue
@@ -19,9 +19,7 @@
             </span>
             <display-raw :object="dependencyResolver" />
         </span>
-        <span v-else>
-            no dependency resolver
-        </span>
+        <span v-else> no dependency resolver </span>
     </span>
 </template>
 <script>
diff --git a/client/src/components/admin/Dependencies/ResolutionDetails.vue b/client/src/components/admin/Dependencies/ResolutionDetails.vue
index 9a7c627e146..b182a7fd0f6 100644
--- a/client/src/components/admin/Dependencies/ResolutionDetails.vue
+++ b/client/src/components/admin/Dependencies/ResolutionDetails.vue
@@ -22,25 +22,19 @@
         </div>
         <span v-else-if="!separateDetails">
             <div class="row">
-                <div class="col">
-                    Requirements
-                </div>
+                <div class="col">Requirements</div>
                 <div class="col-8">
                     <requirements :requirements="resolution.requirements" />
                 </div>
             </div>
             <div class="row">
-                <div class="col">
-                    Status
-                </div>
+                <div class="col">Status</div>
                 <div class="col-8">
                     <status-display :status="resolution.status[0]" :compact="false" :all-statuses="resolution.status" />
                 </div>
             </div>
             <div class="row">
-                <div class="col">
-                    Dependency Resolver
-                </div>
+                <div class="col">Dependency Resolver</div>
                 <div class="col-8">
                     <dependency-resolver :dependency-resolver="resolution.status[0].dependency_resolver" />
                 </div>
@@ -54,17 +48,13 @@
                     </div>
                     <div class="col">
                         <div class="row">
-                            <div class="col">
-                                Status
-                            </div>
+                            <div class="col">Status</div>
                             <div class="col">
                                 <status-display :status="resolution.status[index]" :compact="false" />
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col">
-                                Dependency Resolver
-                            </div>
+                            <div class="col">Dependency Resolver</div>
                             <div class="col">
                                 <dependency-resolver
                                     :dependency-resolver="resolution.status[index].dependency_resolver"
diff --git a/client/src/components/admin/Dependencies/UnusedIndex.vue b/client/src/components/admin/Dependencies/UnusedIndex.vue
index 94fbea2ac5b..489d4b46e66 100644
--- a/client/src/components/admin/Dependencies/UnusedIndex.vue
+++ b/client/src/components/admin/Dependencies/UnusedIndex.vue
@@ -13,9 +13,7 @@
         </template>
         <template v-slot:actions>
             <div>
-                <b-button @click="deleteSelected">
-                    Delete Selected Environments
-                </b-button>
+                <b-button @click="deleteSelected"> Delete Selected Environments </b-button>
             </div>
         </template>
     </dependency-index-wrapper>
diff --git a/client/src/components/xrefs.vue b/client/src/components/xrefs.vue
index 75c9d54b973..0cdf65c2a7e 100644
--- a/client/src/components/xrefs.vue
+++ b/client/src/components/xrefs.vue
@@ -1,9 +1,7 @@
 <template>
     <b-card>
         <template v-slot:header>
-            <h4 class="mb-0">
-                References
-            </h4>
+            <h4 class="mb-0">References</h4>
         </template>
         <table>
             <tr v-for="(xref, index) in xrefs" :key="index">
diff --git a/client/src/layout/menu.js b/client/src/layout/menu.js
index 782705d1862..062191b4926 100644
--- a/client/src/layout/menu.js
+++ b/client/src/layout/menu.js
@@ -70,11 +70,10 @@ export function fetchMenu(options = {}) {
     //
     menu.push({
         id: "analysis",
-        title: _l("Analyze Data"),
         url: "",
-        tooltip: _l("Analysis home view"),
+        tooltip: _l("Tools and Current History"),
+        icon: "fa-home",
     });
-
     //
     // Workflow tab.
     //
@@ -115,38 +114,49 @@ export function fetchMenu(options = {}) {
     //
     // 'Shared Items' or Libraries tab.
     //
-    menu.push({
-        id: "shared",
-        title: _l("Shared Data"),
-        url: "javascript:void(0)",
-        tooltip: _l("Access published resources"),
-        menu: [
-            {
-                title: _l("Data Libraries"),
-                url: "libraries",
-            },
-            {
-                title: _l("Histories"),
-                url: "histories/list_published",
-                target: "__use_router__",
-            },
-            {
-                title: _l("Workflows"),
-                url: "workflows/list_published",
-                target: "__use_router__",
-            },
-            {
-                title: _l("Visualizations"),
-                url: "visualizations/list_published",
-                target: "__use_router__",
-            },
-            {
-                title: _l("Pages"),
-                url: "pages/list_published",
-                target: "__use_router__",
-            },
-        ],
-    });
+    if (Galaxy.config.single_user) {
+        // Single user can still use libraries, especially as we may grow that
+        // functionality as a representation for external data.  The rest is
+        // hidden though.
+        menu.push({
+            title: _l("Data Libraries"),
+            url: "libraries",
+            id: "libraries",
+        });
+    } else {
+        menu.push({
+            id: "shared",
+            title: _l("Shared Data"),
+            url: "javascript:void(0)",
+            tooltip: _l("Access published resources"),
+            menu: [
+                {
+                    title: _l("Data Libraries"),
+                    url: "libraries",
+                },
+                {
+                    title: _l("Histories"),
+                    url: "histories/list_published",
+                    target: "__use_router__",
+                },
+                {
+                    title: _l("Workflows"),
+                    url: "workflows/list_published",
+                    target: "__use_router__",
+                },
+                {
+                    title: _l("Visualizations"),
+                    url: "visualizations/list_published",
+                    target: "__use_router__",
+                },
+                {
+                    title: _l("Pages"),
+                    url: "pages/list_published",
+                    target: "__use_router__",
+                },
+            ],
+        });
+    }
 
     //
     // Admin.
@@ -272,10 +282,11 @@ export function fetchMenu(options = {}) {
                     url: "custom_builds",
                     target: "__use_router__",
                 },
+                { divider: true },
                 {
                     title: _l("Logout"),
-                    divider: true,
                     onclick: userLogout,
+                    hidden: Galaxy.config.single_user,
                 },
                 {
                     title: _l("Datasets"),
@@ -291,6 +302,7 @@ export function fetchMenu(options = {}) {
                     title: _l("Histories shared with me"),
                     url: "histories/list_shared",
                     target: "__use_router__",
+                    hidden: Galaxy.config.single_user,
                 },
                 {
                     title: _l("Pages"),
@@ -312,7 +324,7 @@ export function fetchMenu(options = {}) {
             });
         }
         if (Galaxy.config.interactivetools_enable) {
-            userTab.menu[userTab.menu.length - 1].divider = true;
+            userTab.menu.push({ divider: true });
             userTab.menu.push({
                 title: _l("Active InteractiveTools"),
                 url: "interactivetool_entry_points/list",
@@ -321,6 +333,5 @@ export function fetchMenu(options = {}) {
         }
     }
     menu.push(userTab);
-
     return menu;
 }
diff --git a/client/src/mvc/form/form-parameters.js b/client/src/mvc/form/form-parameters.js
index 38063486280..738fc400132 100644
--- a/client/src/mvc/form/form-parameters.js
+++ b/client/src/mvc/form/form-parameters.js
@@ -44,7 +44,7 @@ export default Backbone.Model.extend({
     /** Returns an input field for a given field type */
     create: function (input_def) {
         const Galaxy = getGalaxyInstance();
-        var fieldClass = this.types[input_def.type];
+        var fieldClass = this.types[input_def.hiddenInWorkflow ? "hidden" : input_def.type];
         var field = typeof this[fieldClass] === "function" ? this[fieldClass].call(this, input_def) : null;
         if (!field) {
             field = input_def.options ? this._fieldSelect(input_def) : this._fieldText(input_def);
@@ -140,7 +140,10 @@ export default Backbone.Model.extend({
     /** Text input field */
     _fieldText: function (input_def) {
         // field replaces e.g. a select field
-        if (input_def.model_class === "SelectTagParameter" || (input_def.options && input_def.data)) {
+        if (
+            ["SelectTagParameter", "ColumnListParameter"].includes(input_def.model_class) ||
+            (input_def.options && input_def.data)
+        ) {
             input_def.area = input_def.multiple;
             if (Utils.isEmpty(input_def.value)) {
                 input_def.value = null;
diff --git a/client/src/mvc/history/options-menu.js b/client/src/mvc/history/options-menu.js
index ff3d57f11c6..8a8b7b752f3 100644
--- a/client/src/mvc/history/options-menu.js
+++ b/client/src/mvc/history/options-menu.js
@@ -32,6 +32,7 @@ var menu = [
                 Galaxy.router.push(`/histories/sharing?id=${Galaxy.currHistoryPanel.model.id}`);
             }
         },
+        singleUserDisable: true,
     },
     {
         html: _l("Show Structure"),
@@ -55,6 +56,7 @@ var menu = [
                 Galaxy.router.push(`/histories/permissions?id=${Galaxy.currHistoryPanel.model.id}`);
             }
         },
+        singleUserDisable: true,
     },
     {
         html: _l("Make Private"),
@@ -200,7 +202,11 @@ Webhooks.load({
 });
 
 function buildMenu(isAnon, purgeAllowed, urlRoot) {
+    const Galaxy = getGalaxyInstance();
     return _.clone(menu).filter((menuOption) => {
+        if (Galaxy.config.single_user && menuOption.singleUserDisable) {
+            return false;
+        }
         if (isAnon && !menuOption.anon) {
             return false;
         }
diff --git a/client/src/mvc/library/library-dataset-view.js b/client/src/mvc/library/library-dataset-view.js
index 5bd575f68bf..0f326e6a8e2 100644
--- a/client/src/mvc/library/library-dataset-view.js
+++ b/client/src/mvc/library/library-dataset-view.js
@@ -478,7 +478,7 @@ var LibraryDatasetView = Backbone.View.extend({
                         </button>
                     <% } %>
                     <% if (item.get("can_user_manage")) { %>
-                        <a href="<% rootPath %>/libraries/folders/permissions/<%- item.get("folder_id") %>/dataset/<%- item.id %>">
+                        <a href="<% rootPath %>/libraries/folders/<%- item.get("folder_id") %>/dataset/<%- item.id %>/permissions">
                             <button data-toggle="tooltip" data-placement="top" title="Manage permissions"
                                 class="btn btn-secondary toolbtn_change_permissions toolbar-item mr-1"
                                 type="button">
diff --git a/client/src/mvc/tool/tool-form-composite.js b/client/src/mvc/tool/tool-form-composite.js
index 91054164092..a68b8dae6f2 100644
--- a/client/src/mvc/tool/tool-form-composite.js
+++ b/client/src/mvc/tool/tool-form-composite.js
@@ -357,6 +357,19 @@ var View = Backbone.View.extend({
                             (!input_def.is_workflow && input_value !== null);
                     }
                     if (!validated) {
+                        if (input_def.type == "hidden") {
+                            this.modal.show({
+                                title: _l("Workflow submission failed"),
+                                body: `Step ${step_index}: ${
+                                    step.step_label || step.step_name
+                                } is in an invalid state. Please remove and re-add this step in the Workflow Editor.`,
+                                buttons: {
+                                    Close: () => {
+                                        this.modal.hide();
+                                    },
+                                },
+                            });
+                        }
                         form.highlight(input_id);
                         break;
                     }
diff --git a/client/src/nls/locale.js b/client/src/nls/locale.js
index aa468ba831c..e2bdae5c293 100644
--- a/client/src/nls/locale.js
+++ b/client/src/nls/locale.js
@@ -458,4 +458,5 @@ define({
     ja: true,
     fr: true,
     zh: true,
+    es: true,
 });
diff --git a/client/src/store/jobMetricsStore.test.js b/client/src/store/jobMetricsStore.test.js
index bf99a44ab55..06a6cd17509 100644
--- a/client/src/store/jobMetricsStore.test.js
+++ b/client/src/store/jobMetricsStore.test.js
@@ -11,7 +11,7 @@ describe("store/jobMetricsStore.js", () => {
 
     test("should simply return fetched metrics list for job ID", () => {
         const state = {
-            jobMetricsByJobId: { "123": [{ plugin: "core", value: 123 }] },
+            jobMetricsByJobId: { 123: [{ plugin: "core", value: 123 }] },
         };
         const metrics = jobMetricsStore.getters.getJobMetricsByJobId(state)("123");
         expect(metrics.length == 1).toBeTruthy();
diff --git a/client/src/style/scss/base.scss b/client/src/style/scss/base.scss
index c3596f3f107..49433ed6d73 100644
--- a/client/src/style/scss/base.scss
+++ b/client/src/style/scss/base.scss
@@ -360,7 +360,7 @@ body {
                     color: $brand-masthead-text-hover;
                 }
                 &.nav-icon {
-                    font-size: 1.7em;
+                    font-size: 1.3em;
                     .nav-note {
                         @extend .font-weight-bold;
                         @extend .position-absolute;
diff --git a/client/src/style/scss/library.scss b/client/src/style/scss/library.scss
index aa1d9d06028..0cdb7e71b74 100644
--- a/client/src/style/scss/library.scss
+++ b/client/src/style/scss/library.scss
@@ -1,10 +1,10 @@
 @import "theme/blue.scss";
 
 .library_style_container {
-    width: 95%;
-    margin: auto;
-    margin-top: 1em;
-    overflow: auto !important;
+    width: 100%;
+    height: 100%;
+    padding: 1em;
+    overflow: auto;
 
     .fa-globe,
     .fa-shield,
diff --git a/client/src/utils/uploadbox.js b/client/src/utils/uploadbox.js
index 755f3719c67..ab2720963cb 100644
--- a/client/src/utils/uploadbox.js
+++ b/client/src/utils/uploadbox.js
@@ -228,6 +228,41 @@ import { getAppRoot } from "onload/loadConfig";
             },
         });
     };
+    /**
+     *
+     * @param {*} config
+     */
+    $.datafetchpost = function (config) {
+        var cnf = $.extend(
+            {},
+            {
+                data: {},
+                success: () => {},
+                error: () => {},
+                progress: () => {},
+                url: null,
+            },
+            config
+        );
+        var data = cnf.data;
+        if (data.error_message) {
+            cnf.error(data.error_message);
+            return;
+        }
+
+        // submit request
+        _uploadrequest({
+            url: cnf.url,
+            data: JSON.stringify(cnf.data),
+            success: cnf.success,
+            error: cnf.error,
+            progress: (e) => {
+                if (e.lengthComputable) {
+                    cnf.progress(Math.round((e.loaded * 100) / e.total));
+                }
+            },
+        });
+    };
 
     /**
         Handles the upload events drag/drop etc.
@@ -391,6 +426,7 @@ import { getAppRoot } from "onload/loadConfig";
 
             // create and submit data
             var submitter = $.uploadpost;
+            var requestData = opts.initialize(index);
             if (
                 file.chunk_mode &&
                 session &&
@@ -399,10 +435,13 @@ import { getAppRoot } from "onload/loadConfig";
                 session.chunk_upload_size > 0
             ) {
                 submitter = $.uploadchunk;
+            } else if (requestData.fetchRequest) {
+                submitter = $.datafetchpost;
             }
+
             submitter({
-                url: opts.url,
-                data: opts.initialize(index),
+                url: opts.initUrl(index),
+                data: requestData.fetchRequest ? requestData.fetchRequest : requestData.uploadRequest,
                 session: session,
                 success: (message) => {
                     opts.success(index, message);
diff --git a/client/yarn.lock b/client/yarn.lock
index 73df6290ded..74eb5085a96 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -9,6 +9,13 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
+"@babel/code-frame@7.12.11", "@babel/code-frame@^7.8.3":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -23,13 +30,6 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
 "@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
@@ -40,24 +40,23 @@
     semver "^5.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
+    lodash "^4.17.19"
     semver "^5.4.1"
     source-map "^0.5.0"
 
@@ -101,6 +100,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.12.10", "@babel/generator@^7.9.6":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
+  dependencies:
+    "@babel/types" "^7.12.11"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a"
@@ -111,16 +119,6 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
-  dependencies:
-    "@babel/types" "^7.9.6"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/helper-annotate-as-pure@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
@@ -228,13 +226,13 @@
     "@babel/types" "^7.8.3"
 
 "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
@@ -243,12 +241,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.12.10", "@babel/helper-get-function-arity@^7.8.3":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -264,12 +262,12 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
+  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.7"
 
 "@babel/helper-module-imports@^7.10.4":
   version "7.10.4"
@@ -278,12 +276,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-module-imports@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
   version "7.11.0"
@@ -298,18 +296,20 @@
     "@babel/types" "^7.11.0"
     lodash "^4.17.19"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-transforms@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-simple-access" "^7.12.1"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    lodash "^4.17.19"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -318,19 +318,14 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-optimise-call-expression@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.10"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
-"@babel/helper-plugin-utils@^7.10.4":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
@@ -370,15 +365,15 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+"@babel/helper-replace-supers@^7.12.1":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
+  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/helper-member-expression-to-functions" "^7.12.7"
+    "@babel/helper-optimise-call-expression" "^7.12.10"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-simple-access@^7.10.4":
   version "7.10.4"
@@ -388,13 +383,12 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-simple-access@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.1"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
   version "7.11.0"
@@ -411,21 +405,21 @@
     "@babel/types" "^7.11.0"
 
 "@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
 "@babel/helper-wrap-function@^7.10.4":
   version "7.10.4"
@@ -446,14 +440,14 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+"@babel/helpers@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -473,19 +467,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
 "@babel/parser@^7.1.2":
   version "7.1.3"
@@ -502,16 +487,16 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
   integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
 
-"@babel/parser@^7.7.0", "@babel/parser@^7.8.6":
+"@babel/parser@^7.6.0":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+
+"@babel/parser@^7.7.0":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c"
   integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==
 
-"@babel/parser@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
-  integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
-
 "@babel/parser@~7.10.3":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
@@ -654,11 +639,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
-  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -688,20 +673,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
-  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -709,20 +687,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
+"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
@@ -751,6 +722,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-arrow-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
@@ -1176,25 +1154,16 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/template@^7.3.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/template@^7.12.7", "@babel/template@^7.3.3", "@babel/template@^7.8.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
 
-"@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.9.6":
+"@babel/traverse@^7.1.0":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
   integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
@@ -1224,6 +1193,21 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+  integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.12.10"
+    "@babel/types" "^7.12.10"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/traverse@^7.7.0":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
@@ -1254,12 +1238,12 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
-  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.6":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
+  integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
@@ -1272,6 +1256,15 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
+  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.12.10":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
@@ -1281,7 +1274,7 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+"@babel/types@^7.4.4", "@babel/types@^7.6.0":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
   integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
@@ -1290,7 +1283,7 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.7.0", "@babel/types@^7.8.6":
+"@babel/types@^7.7.0":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01"
   integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==
@@ -1299,15 +1292,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@~7.10.3":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
@@ -1410,6 +1394,21 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@eslint/eslintrc@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
+  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
 "@fortawesome/fontawesome-common-types@^0.2.28":
   version "0.2.28"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz#1091bdfe63b3f139441e9cba27aa022bff97d8b2"
@@ -1474,12 +1473,13 @@
   integrity sha512-vDxM5ZxI/7/i7Vtg7bhp4oJC8LtkLm+Fag70DBW3k7KYFyHYFYz75Wshf0nQzETIHFdwZEQa1ERmmjk2vnfaUw==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
-  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
     find-up "^4.1.0"
+    get-package-type "^0.1.0"
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
@@ -1488,93 +1488,93 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
-  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
+"@jest/console@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.6.2"
+    jest-util "^26.6.2"
     slash "^3.0.0"
 
-"@jest/core@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc"
-  integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==
+"@jest/core@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/reporters" "^26.4.1"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.6.2"
+    "@jest/reporters" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.3.0"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
+    jest-changed-files "^26.6.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-resolve-dependencies "^26.4.2"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
-    jest-watcher "^26.3.0"
+    jest-resolve "^26.6.2"
+    jest-resolve-dependencies "^26.6.3"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    jest-watcher "^26.6.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
-  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
+"@jest/environment@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
   dependencies:
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
+    jest-mock "^26.6.2"
 
-"@jest/fake-timers@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
-  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
+"@jest/fake-timers@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
-"@jest/globals@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a"
-  integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==
+"@jest/globals@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/types" "^26.3.0"
-    expect "^26.4.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    expect "^26.6.2"
 
-"@jest/reporters@^26.4.1":
-  version "26.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
-  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
+"@jest/reporters@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1585,63 +1585,63 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^5.0.1"
+    v8-to-istanbul "^7.0.0"
   optionalDependencies:
     node-notifier "^8.0.0"
 
-"@jest/source-map@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
-  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
+"@jest/source-map@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
-  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
+"@jest/test-result@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba"
-  integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==
+"@jest/test-sequencer@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
   dependencies:
-    "@jest/test-result" "^26.3.0"
+    "@jest/test-result" "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
+    jest-haste-map "^26.6.2"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
 
-"@jest/transform@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
-  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
+"@jest/transform@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
+    jest-haste-map "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.6.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -1658,10 +1658,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71"
-  integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1814,10 +1814,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@testing-library/jest-dom@^5.11.3":
-  version "5.11.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.3.tgz#3802cb244e9ab50559a20344698a2d41f9bf11ec"
-  integrity sha512-vP8ABJt4+YIzu9UItbpJ6nM5zN3g9/tpLcp2DJiXyfX9gnwgcmLsa42+YiohNGEtSUTsseb6xB9HAwlgk8WdaQ==
+"@testing-library/jest-dom@^5.11.9":
+  version "5.11.9"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz#e6b3cd687021f89f261bd53cbe367041fbd3e975"
+  integrity sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
@@ -1825,8 +1825,6 @@
     chalk "^3.0.0"
     css "^3.0.0"
     css.escape "^1.5.1"
-    jest-diff "^25.1.0"
-    jest-matcher-utils "^25.1.0"
     lodash "^4.17.15"
     redent "^3.0.0"
 
@@ -1845,21 +1843,10 @@
   resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.4.tgz#bfd5b0d0d1ba13e351dff65b6e52783b816826c8"
   integrity sha512-WiZhq3SVJHFRgRYLXvpf65XnV6ipVHhnNaNvE8yCimejrGglkg38kEj0JcizqwSHxmPSjcTlig/6JouxLGEhGw==
 
-"@types/babel__core@^7.0.0":
-  version "7.1.9"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d"
-  integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__core@^7.1.7":
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
-  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+  version "7.1.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
+  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1868,24 +1855,24 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
-  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
+  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
+  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz#1ae3010e8bf8851d324878b42acec71986486d18"
-  integrity sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1921,13 +1908,18 @@
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.2":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
-  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
+  integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
+"@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
@@ -1973,9 +1965,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "11.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.7.tgz#f1c35a906b82adae76ede5ab0d2088e58fa37843"
-  integrity sha512-bHbRcyD6XpXVLg42QYaQCjvDXaCFkvb3WbCIxSDmhGbJYVroxvYzekk9QGg1beeIawfvSLkdZpP0h7jxE4ihnA==
+  version "14.14.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
+  integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1992,10 +1984,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/stack-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/stacktrace-js@^0.0.33":
   version "0.0.33"
@@ -2063,9 +2055,9 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^15.0.0":
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
-  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
+  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2352,6 +2344,11 @@ acorn-jsx@^5.2.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
+acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
 acorn-walk@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
@@ -2377,20 +2374,15 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
-
 acorn@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
   integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
 
-acorn@^7.3.1:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 address@1.0.3, address@^1.0.1:
   version "1.0.3"
@@ -2447,16 +2439,6 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^6.1.0:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
@@ -2487,7 +2469,7 @@ ajv@^6.12.0, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2497,14 +2479,14 @@ ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.9.1:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+ajv@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
+  integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
   dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
@@ -2612,7 +2594,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -2620,6 +2602,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
@@ -2866,10 +2855,10 @@ ast-types@^0.7.2:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"
   integrity sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async-done@^1.2.0, async-done@^1.2.2:
   version "1.3.1"
@@ -2905,7 +2894,7 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob@^2.1.1, atob@^2.1.2:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
@@ -2981,16 +2970,16 @@ babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
-  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
+babel-jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
   dependencies:
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.3.0"
+    babel-preset-jest "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -3031,10 +3020,10 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.2.0:
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd"
-  integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==
+babel-plugin-jest-hoist@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -3072,10 +3061,10 @@ babel-plugin-transform-vue-template@^0.4.2:
     "@babel/template" "^7.0.0-beta.46"
     vue-template-es2015-compiler "^1.5.3"
 
-babel-preset-current-node-syntax@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da"
-  integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -3088,14 +3077,15 @@ babel-preset-current-node-syntax@^0.1.3:
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
-  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
+babel-preset-jest@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
   dependencies:
-    babel-plugin-jest-hoist "^26.2.0"
-    babel-preset-current-node-syntax "^0.1.3"
+    babel-plugin-jest-hoist "^26.6.2"
+    babel-preset-current-node-syntax "^1.0.0"
 
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
@@ -3183,6 +3173,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+base64-arraybuffer@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
@@ -3785,7 +3780,7 @@ chai@^4.2.0:
     pathval "^1.1.0"
     type-detect "^4.0.5"
 
-chalk@2.4.2, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3805,7 +3800,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
+chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
@@ -3822,15 +3817,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
-  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@~4.1.0:
+chalk@^4.0.0, chalk@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -3880,7 +3867,7 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
-chokidar@3.4.0, "chokidar@>=2.0.0 <4.0.0", chokidar@^2.0.0, chokidar@^2.0.4, chokidar@^2.1.8, chokidar@^3.0.0, chokidar@^3.4.0:
+chokidar@3.4.0, "chokidar@>=2.0.0 <4.0.0", chokidar@^2.0.0, chokidar@^2.0.4, chokidar@^2.1.8, chokidar@^3.4.0, chokidar@^3.4.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
   integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
@@ -3952,6 +3939,11 @@ citeproc@^2.2.27:
   resolved "https://registry.yarnpkg.com/citeproc/-/citeproc-2.3.8.tgz#631c9afdd8028e93b6d196bfbf01808db04dcecd"
   integrity sha512-5Iq/LpgmitH0Jdy+iMDyenw3Ph/+sdxZU6Tvn9e75zZR4mRdn2qY0TgPSSQIuxAebACsfSWoie4s/VHaXw7+kg==
 
+cjs-module-lexer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -4315,12 +4307,12 @@ component-bind@1.0.0:
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
   integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
-component-emitter@1.2.1, component-emitter@^1.2.1:
+component-emitter@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
   integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
-component-emitter@~1.3.0:
+component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -4355,7 +4347,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -4936,7 +4928,7 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4:
+debug@4, debug@^4.1.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
@@ -4950,7 +4942,7 @@ debug@^3.1.1, debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+debug@^4.0.1, debug@^4.1.1, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -5184,10 +5176,10 @@ diff-sequences@^25.2.6:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
 
-diff-sequences@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
-  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
+diff-sequences@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 diff@^4.0.2:
   version "4.0.2"
@@ -5466,13 +5458,20 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 end-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/end-stream/-/end-stream-0.1.0.tgz#32003f3f438a2b0143168137f8fa6e9866c81ed5"
@@ -5481,37 +5480,37 @@ end-stream@~0.1.0:
     write-stream "~0.4.3"
 
 engine.io-client@~3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.2.tgz#4fb2ef2b1fe1d3aa1c621c6a8d87f1fc55426b50"
-  integrity sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
+  integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==
   dependencies:
     component-emitter "~1.3.0"
     component-inherit "0.0.3"
-    debug "~4.1.0"
+    debug "~3.1.0"
     engine.io-parser "~2.2.0"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
     ws "~6.1.0"
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
 engine.io-parser@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
-  integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
+    base64-arraybuffer "0.1.4"
     blob "0.0.5"
     has-binary2 "~1.0.2"
 
 engine.io@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.1.tgz#a61cbc13fa0cb27d9453fd079a29ee980564b069"
-  integrity sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"
+  integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
@@ -5673,11 +5672,6 @@ es6-object-assign@^1.1.0, es6-object-assign@~1.1.0:
   resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
   integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
 
-es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
-
 es6-promise@^4.2.6:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
@@ -5745,14 +5739,15 @@ escodegen@^1.12.0, escodegen@^1.14.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-vue@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe"
-  integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==
+eslint-plugin-vue@^7.7.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz#a90df4595e670821bf243bd2750ededdb74948b8"
+  integrity sha512-mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ==
   dependencies:
+    eslint-utils "^2.1.0"
     natural-compare "^1.4.0"
-    semver "^5.6.0"
-    vue-eslint-parser "^7.0.0"
+    semver "^7.3.2"
+    vue-eslint-parser "^7.6.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -5770,12 +5765,12 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
 eslint-utils@^2.1.0:
@@ -5800,28 +5795,34 @@ eslint-visitor-keys@^1.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint@^7.7.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.7.0.tgz#18beba51411927c4b64da0a8ceadefe4030d6073"
-  integrity sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
+  integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
+    eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
-    espree "^7.2.0"
-    esquery "^1.2.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
-    globals "^12.1.0"
+    globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -5829,7 +5830,7 @@ eslint@^7.7.0:
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.19"
+    lodash "^4.17.21"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
@@ -5838,7 +5839,7 @@ eslint@^7.7.0:
     semver "^7.2.1"
     strip-ansi "^6.0.0"
     strip-json-comments "^3.1.0"
-    table "^5.2.3"
+    table "^6.0.4"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -5847,22 +5848,22 @@ esm@^3.2.25:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+espree@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-espree@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
-  integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
-    acorn "^7.3.1"
-    acorn-jsx "^5.2.0"
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^2.1.0:
@@ -5880,17 +5881,10 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
-  dependencies:
-    estraverse "^4.0.0"
-
-esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
@@ -5901,7 +5895,14 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
@@ -5911,15 +5912,20 @@ estraverse@^5.1.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
   integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 estree-walker@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.9.0.tgz#9116372f09c02fd88fcafb0c04343631012a0aa6"
   integrity sha512-12U47o7XHUX329+x3FzNVjCx3SHEzMF0nkDv7r/HnBzX/xNTKxajBk6gyygaxrAFtLj39219oMfbtxv4KpaOiA==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
@@ -5942,9 +5948,9 @@ eventemitter3@^3.0.0:
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 eventemitter3@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
-  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.0.0:
   version "3.0.0"
@@ -6024,16 +6030,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"
-  integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==
+expect@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     ansi-styles "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
 expose-loader@^1.0.0:
@@ -6130,16 +6136,6 @@ extract-from-css@^0.4.4:
   dependencies:
     css "^2.1.0"
 
-extract-zip@^1.6.5:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
-  integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
-  dependencies:
-    concat-stream "1.6.2"
-    debug "2.6.9"
-    mkdirp "0.5.1"
-    yauzl "2.4.1"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -6160,11 +6156,6 @@ fancy-log@^1.3.2:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -6199,9 +6190,9 @@ fast-glob@^3.0.3:
     micromatch "^4.0.2"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
   version "2.0.6"
@@ -6236,13 +6227,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
 fetch-cookie@0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
@@ -6262,12 +6246,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
 file-loader@^6.0.0:
   version "6.0.0"
@@ -6429,26 +6413,20 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
   integrity sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
-  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
-
-flatted@^2.0.1, flatted@^2.0.2:
+flatted@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flatted@^3.0.5:
+flatted@^3.0.5, flatted@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
   integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
@@ -6549,15 +6527,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
-  integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -6598,9 +6567,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d"
+  integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==
 
 fsevents@~2.1.2:
   version "2.1.2"
@@ -6623,9 +6592,9 @@ functional-red-black-tree@^1.0.1:
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
@@ -6656,6 +6625,11 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
   integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-size@^2.0.0, get-size@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/get-size/-/get-size-2.0.3.tgz#54a1d0256b20ea7ac646516756202769941ad2ef"
@@ -6768,19 +6742,7 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.5, glob@^7.1.6, glob@~7.1.6:
+glob@^7.1.4, glob@^7.1.5, glob@^7.1.6, glob@~7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6829,9 +6791,9 @@ global-prefix@^3.0.0:
     which "^1.3.1"
 
 globals@^11.1.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^12.1.0:
   version "12.3.0"
@@ -6840,6 +6802,13 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
+globals@^13.6.0:
+  version "13.6.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7"
+  integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==
+  dependencies:
+    type-fest "^0.20.2"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -6921,7 +6890,7 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.15:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -7017,14 +6986,6 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
@@ -7136,14 +7097,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hasha@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
-  integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=
-  dependencies:
-    is-stream "^1.0.1"
-    pinkie-promise "^2.0.0"
-
 he@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -7431,6 +7384,14 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -7500,20 +7461,20 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+inherits@2, inherits@2.0.4, inherits@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-inherits@2.0.4, inherits@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5:
   version "1.3.5"
@@ -7745,6 +7706,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -8281,59 +8249,59 @@ javascript-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.0.1.tgz#6ef358035310e35d667c675ed63d3eb7c1aa19e5"
   integrity sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==
 
-jest-changed-files@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
-  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
+jest-changed-files@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da"
-  integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==
+jest-cli@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
   dependencies:
-    "@jest/core" "^26.4.2"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/core" "^26.6.3"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-config "^26.6.3"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     prompts "^2.0.1"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-config@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558"
-  integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==
+jest-config@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.4.2"
-    "@jest/types" "^26.3.0"
-    babel-jest "^26.3.0"
+    "@jest/test-sequencer" "^26.6.3"
+    "@jest/types" "^26.6.2"
+    babel-jest "^26.6.3"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.3.0"
-    jest-environment-node "^26.3.0"
+    jest-environment-jsdom "^26.6.2"
+    jest-environment-node "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.4.2"
+    jest-jasmine2 "^26.6.3"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     micromatch "^4.0.2"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
 
-jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0:
+jest-diff@^25.2.1:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
   integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
@@ -8343,15 +8311,15 @@ jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0:
     jest-get-type "^25.2.6"
     pretty-format "^25.5.0"
 
-jest-diff@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa"
-  integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==
+jest-diff@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.3.0"
+    diff-sequences "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
 
 jest-docblock@^26.0.0:
   version "26.0.0"
@@ -8360,41 +8328,41 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae"
-  integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==
+jest-each@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
 
-jest-environment-jsdom@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
-  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+jest-environment-jsdom@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
-    jsdom "^16.2.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
+    jsdom "^16.4.0"
 
-jest-environment-node@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
-  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
+jest-environment-node@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
 jest-get-type@^25.2.6:
   version "25.2.6"
@@ -8406,99 +8374,90 @@ jest-get-type@^26.3.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
-  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
+jest-haste-map@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
     jest-regex-util "^26.0.0"
-    jest-serializer "^26.3.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-serializer "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257"
-  integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==
+jest-jasmine2@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.4.2"
+    expect "^26.6.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.4.2"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-each "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
     throat "^5.0.0"
 
-jest-leak-detector@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"
-  integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==
+jest-leak-detector@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
   dependencies:
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
 
-jest-matcher-utils@^25.1.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz#fbc98a12d730e5d2453d7f1ed4a4d948e34b7867"
-  integrity sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==
-  dependencies:
-    chalk "^3.0.0"
-    jest-diff "^25.5.0"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.5.0"
-
-jest-matcher-utils@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06"
-  integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==
+jest-matcher-utils@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.4.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
 
-jest-message-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
-  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
+jest-message-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.3.0"
-    "@types/stack-utils" "^1.0.1"
+    "@jest/types" "^26.6.2"
+    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
+    pretty-format "^26.6.2"
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
-jest-mock@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
-  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
+jest-mock@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
@@ -8516,151 +8475,153 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5"
-  integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==
+jest-resolve-dependencies@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.4.2"
+    jest-snapshot "^26.6.2"
 
-jest-resolve@^26.4.0:
-  version "26.4.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
-  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
+jest-resolve@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.3.0"
+    jest-util "^26.6.2"
     read-pkg-up "^7.0.1"
-    resolve "^1.17.0"
+    resolve "^1.18.1"
     slash "^3.0.0"
 
-jest-runner@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853"
-  integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==
+jest-runner@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
+    jest-config "^26.6.3"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.3.0"
-    jest-leak-detector "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-runtime "^26.4.2"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.6.2"
+    jest-leak-detector "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42"
-  integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==
+jest-runtime@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/globals" "^26.4.2"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/globals" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
+    cjs-module-lexer "^0.6.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.6.2"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-serializer@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
-  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
+jest-serializer@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
   dependencies:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6"
-  integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==
+jest-snapshot@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
+    "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.4.2"
+    expect "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.4.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-haste-map "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
+    jest-haste-map "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
     semver "^7.3.2"
 
-jest-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
-  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
+jest-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
-jest-validate@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c"
-  integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==
+jest-validate@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.6.2"
 
-jest-watcher@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
-  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
+jest-watcher@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
   dependencies:
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.6.2"
     string-length "^4.0.1"
 
 jest-worker@^25.4.0:
@@ -8671,23 +8632,23 @@ jest-worker@^25.4.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
-  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
+jest-worker@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312"
-  integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==
+jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
   dependencies:
-    "@jest/core" "^26.4.2"
+    "@jest/core" "^26.6.3"
     import-local "^3.0.2"
-    jest-cli "^26.4.2"
+    jest-cli "^26.6.3"
 
 jquery-migrate@~1.4:
   version "1.4.1"
@@ -8787,9 +8748,9 @@ js-yaml@^3.12.0, js-yaml@^3.9.0:
     esprima "^4.0.0"
 
 js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -8799,10 +8760,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.2.2:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
-  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+jsdom@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
   dependencies:
     abab "^2.0.3"
     acorn "^7.1.1"
@@ -8824,7 +8785,7 @@ jsdom@^16.2.2:
     tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
@@ -8832,9 +8793,9 @@ jsdom@^16.2.2:
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
@@ -8851,16 +8812,16 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -8900,13 +8861,6 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -9009,11 +8963,6 @@ just-extend@^4.0.2:
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
   integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
 
-karma-chai@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/karma-chai/-/karma-chai-0.1.0.tgz#bee5ad40400517811ae34bb945f762909108b79a"
-  integrity sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=
-
 karma-chrome-launcher@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738"
@@ -9021,14 +8970,6 @@ karma-chrome-launcher@^3.1.0:
   dependencies:
     which "^1.2.1"
 
-karma-phantomjs-launcher@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2"
-  integrity sha1-0jyjSAG9qYY60xjju0vUBisTrNI=
-  dependencies:
-    lodash "^4.0.1"
-    phantomjs-prebuilt "^2.1.7"
-
 karma-polyfill@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-polyfill/-/karma-polyfill-1.1.0.tgz#e729a06ab6b0d3b5a82ecc044196d1e1d0fdf533"
@@ -9052,23 +8993,22 @@ karma-webpack@^4.0.2:
     webpack-dev-middleware "^3.7.0"
 
 karma@^5.0.9:
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-5.0.9.tgz#11a119b0c763a806fdc471b40c594a2240b5ca13"
-  integrity sha512-dUA5z7Lo7G4FRSe1ZAXqOINEEWxmCjDBbfRBmU/wYlSMwxUQJP/tEEP90yJt3Uqo03s9rCgVnxtlfq+uDhxSPg==
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4"
+  integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==
   dependencies:
     body-parser "^1.19.0"
     braces "^3.0.2"
-    chokidar "^3.0.0"
+    chokidar "^3.4.2"
     colors "^1.4.0"
     connect "^3.7.0"
     di "^0.0.1"
     dom-serialize "^2.2.1"
-    flatted "^2.0.2"
     glob "^7.1.6"
     graceful-fs "^4.2.4"
     http-proxy "^1.18.1"
     isbinaryfile "^4.0.6"
-    lodash "^4.17.15"
+    lodash "^4.17.19"
     log4js "^6.2.1"
     mime "^2.4.5"
     minimatch "^3.0.4"
@@ -9078,14 +9018,9 @@ karma@^5.0.9:
     socket.io "^2.3.0"
     source-map "^0.6.1"
     tmp "0.2.1"
-    ua-parser-js "0.7.21"
+    ua-parser-js "0.7.22"
     yargs "^15.3.1"
 
-kew@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
-  integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=
-
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -9111,16 +9046,9 @@ kind-of@^5.0.0, kind-of@^5.0.2:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^2.0.1:
   version "2.0.2"
@@ -9446,21 +9374,26 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.1, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
+lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.17.19:
+lodash@^4.17.13, lodash@^4.17.19, lodash@^4.17.20:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 log-symbols@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
@@ -9469,9 +9402,9 @@ log-symbols@^3.0.0:
     chalk "^2.4.2"
 
 log4js@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.2.1.tgz#fc23a3bf287f40f5b48259958e5e0ed30d558eeb"
-  integrity sha512-7n+Oqxxz7VcQJhIlqhcYZBTpbcQ7XsR0MUIfJkx/n3VUjkAS4iUr+4UJlhxf28RvP9PMGQXbgTUhLApnu0XXgA==
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
+  integrity sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==
   dependencies:
     date-format "^3.0.0"
     debug "^4.1.1"
@@ -9827,9 +9760,9 @@ mime@^2.4.4:
   integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
 
 mime@^2.4.5:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009"
-  integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -9885,16 +9818,11 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.2.5:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -9940,14 +9868,14 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -10008,7 +9936,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1, ms@^2.1.1:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
@@ -10018,6 +9946,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -10759,9 +10692,9 @@ p-try@^1.0.0:
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pako@~1.0.5:
   version "1.0.6"
@@ -10863,6 +10796,11 @@ parseqs@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
+parseqs@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
@@ -10870,6 +10808,11 @@ parseuri@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
+parseuri@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
@@ -10998,42 +10941,12 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-phantomjs-polyfill@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/phantomjs-polyfill/-/phantomjs-polyfill-0.0.2.tgz#8c6a7163e9bc8fd9ffdbe7d605cb5352f9fb891e"
-  integrity sha1-jGpxY+m8j9n/2+fWBctTUvn7iR4=
-
-phantomjs-prebuilt@^2.1.7:
-  version "2.1.16"
-  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef"
-  integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=
-  dependencies:
-    es6-promise "^4.0.3"
-    extract-zip "^1.6.5"
-    fs-extra "^1.0.0"
-    hasha "^2.2.0"
-    kew "^0.7.0"
-    progress "^1.1.8"
-    request "^2.81.0"
-    request-progress "^2.0.1"
-    which "^1.2.10"
-
-picomatch@^2.0.4, picomatch@^2.0.5:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
-  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
-
-picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -11767,10 +11680,10 @@ prettier@^1.18.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
   integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
-prettier@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
-  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
+prettier@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-format@^25.2.1, pretty-format@^25.5.0:
   version "25.5.0"
@@ -11782,15 +11695,15 @@ pretty-format@^25.2.1, pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237"
-  integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==
+pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.6.2"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
-    react-is "^16.12.0"
+    react-is "^17.0.1"
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
@@ -11840,11 +11753,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
 progress@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -11920,11 +11828,6 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
 psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -12077,7 +11980,7 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
@@ -12341,6 +12244,11 @@ react-is@^16.8.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.5.tgz#c54ac229dd66b5afe0de5acbe47647c3da692ff8"
   integrity sha512-sudt2uq5P/2TznPV4Wtdi+Lnq3yaYW8LfvPKLM9BKD8jJNBkxMVyB0C9/GmVhLw7Jbdmndk/73n7XQGeN9A3QQ==
 
+react-is@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -12789,13 +12697,6 @@ replace-homedir@^1.0.0:
     is-absolute "^1.0.0"
     remove-trailing-separator "^1.1.0"
 
-request-progress@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
-  integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=
-  dependencies:
-    throttleit "^1.0.0"
-
 request-promise-core@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
@@ -12812,32 +12713,6 @@ request-promise-native@^1.0.8:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.81.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -12869,6 +12744,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -12945,14 +12825,14 @@ resolve@1.9.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.1.7:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.10.0, resolve@^1.17.0, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -12966,6 +12846,14 @@ resolve@^1.12.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.18.1, resolve@^1.3.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 resolve@^1.4.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
@@ -13031,13 +12919,6 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.5.4:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -13280,7 +13161,7 @@ semver-greatest-satisfied-range@^1.1.0:
   dependencies:
     sver-compat "^1.5.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -13290,7 +13171,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^5.5.1:
+semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -13362,20 +13243,10 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -13470,9 +13341,9 @@ sigmund@^1.0.1:
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -13509,14 +13380,14 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 slugify@^1.4.0:
   version "1.4.0"
@@ -13579,11 +13450,11 @@ socket.io-client@2.3.0:
     to-array "0.1.4"
 
 socket.io-parser@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
-  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199"
+  integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     debug "~3.1.0"
     isarray "2.0.1"
 
@@ -13658,18 +13529,7 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
-  dependencies:
-    atob "^2.1.1"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-resolve@^0.5.2:
+source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
@@ -14150,6 +14010,11 @@ strip-json-comments@^3.1.0:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
   integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
 
+strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 stubs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
@@ -14202,9 +14067,9 @@ supports-color@^5.3.0, supports-color@^5.5.0:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
@@ -14262,15 +14127,15 @@ sync-fetch@^0.1.0:
     buffer "^5.4.2"
     node-fetch "^2.6.0"
 
-table@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
-  integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==
+table@^6.0.4:
+  version "6.0.7"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
+  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
   dependencies:
-    ajv "^6.9.1"
-    lodash "^4.17.11"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    ajv "^7.0.2"
+    lodash "^4.17.20"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
 
 tapable@^1.0.0:
   version "1.1.0"
@@ -14380,11 +14245,6 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
-
 through2-filter@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
@@ -14597,14 +14457,6 @@ tough-cookie@^3.0.1:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
@@ -14688,6 +14540,11 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -14737,10 +14594,10 @@ typescript-tuple@^2.1.0:
   dependencies:
     typescript-compare "^0.0.2"
 
-ua-parser-js@0.7.21:
-  version "0.7.21"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
-  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
+ua-parser-js@0.7.22:
+  version "0.7.22"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
+  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -14853,14 +14710,14 @@ unified@^8.2.0:
     vfile "^4.0.0"
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 uniq@^1.0.1:
   version "1.0.1"
@@ -15072,10 +14929,10 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
-v8-to-istanbul@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
-  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+v8-to-istanbul@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc"
+  integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -15217,16 +15074,16 @@ vue-docgen-api@^4.23.1:
     ts-map "^1.0.3"
     vue-template-compiler "^2.0.0"
 
-vue-eslint-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz#a4ed2669f87179dedd06afdd8736acbb3a3864d6"
-  integrity sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g==
+vue-eslint-parser@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz#01ea1a2932f581ff244336565d712801f8f72561"
+  integrity sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==
   dependencies:
     debug "^4.1.1"
     eslint-scope "^5.0.0"
     eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+    espree "^6.2.1"
+    esquery "^1.4.0"
     lodash "^4.17.15"
 
 vue-functional-data-merge@^3.1.0:
@@ -15493,7 +15350,7 @@ webidl-conversions@^5.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webidl-conversions@^6.0.0:
+webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
@@ -15722,7 +15579,7 @@ which-typed-array@^1.1.2:
     has-symbols "^1.0.1"
     is-typed-array "^1.1.3"
 
-which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -15846,13 +15703,6 @@ write-stream@~0.4.3:
   dependencies:
     readable-stream "~0.0.2"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
@@ -15860,7 +15710,12 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.1.2, ws@^7.2.3:
+ws@^7.1.2:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
+  integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
+
+ws@^7.2.3:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
   integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
@@ -15967,7 +15822,7 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.1:
+yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -16015,10 +15870,10 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.3.1:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
-  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+yargs@^15.3.1, yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"
@@ -16030,7 +15885,7 @@ yargs@^15.3.1:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^18.1.1"
+    yargs-parser "^18.1.2"
 
 yargs@^7.1.0:
   version "7.1.0"
@@ -16061,13 +15916,6 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
-yauzl@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
-  integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
-  dependencies:
-    fd-slicer "~1.0.1"
-
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
diff --git a/config/dev.ini b/config/dev.ini
new file mode 100644
index 00000000000..1bf93b5a6ba
--- /dev/null
+++ b/config/dev.ini
@@ -0,0 +1,34 @@
+[circus]
+debug = True
+
+[env]
+GALAXY_CONFIG_FILE=config/galaxy.yml
+PYTHONPATH=lib
+
+[watcher:web]
+cmd = gunicorn 'galaxy.webapps.galaxy.fast_factory:factory()' --pythonpath lib -k uvicorn.workers.UvicornWorker -b fd://$(circus.sockets.web)
+send_hup = true
+numprocesses = 1
+use_sockets = True
+stop_signal = TERM
+stop_children = True
+copy_env = True
+
+[watcher:client]
+working_dir = client
+cmd = yarn watch
+numprocesses = 1
+singleton = True
+copy_env = True
+stop_signal = TERM
+stop_children = True
+
+[socket:web]
+host = 0.0.0.0
+port = 8080
+
+[watcher:celery]
+cmd = celery
+args = --app galaxy.celery worker -l debug
+copy_env = True
+numprocesses = 1
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 11c2ceac55e..ddc26a4658c 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -3362,6 +3362,20 @@
 :Type: int
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~
+``flush_per_n_datasets``
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Maximum number of datasets to create before flushing created
+    datasets to database. This affects tools that create many output
+    datasets. Higher values will lead to fewer database flushes and
+    faster execution, but require more memory. Set to -1 to disable
+    creating datasets in batches.
+:Default: ``1000``
+:Type: int
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``history_local_serial_workflow_scheduling``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4346,6 +4360,18 @@
 :Type: str
 
 
+~~~~~~~~~~~~~~~~~~~~~~~
+``enable_celery_tasks``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Offload long-running tasks to a Celery task queue. Activate this
+    only if you have setup a Celery worker for Galaxy. For details,
+    see https://docs.galaxyproject.org/en/master/admin/production.html
+:Default: ``false``
+:Type: bool
+
+
 ~~~~~~~~~~~~~~
 ``use_pbkdf2``
 ~~~~~~~~~~~~~~
diff --git a/doc/source/admin/jobs.md b/doc/source/admin/jobs.md
index a88b8adfe56..936d7e093e4 100644
--- a/doc/source/admin/jobs.md
+++ b/doc/source/admin/jobs.md
@@ -126,6 +126,53 @@ The images used for containers can either be specified explicitely in the ``<des
 tool requirements of the Galaxy tool being executed. In this latter case the image is specified by the
 tool using a ``<container>`` tag in the ``<requirements>`` section.
 
+### Running jobs on a Kubernetes cluster via Pulsar
+
+In order to dispatch jobs to a Kubernetes (K8s) cluster via Pulsar, 
+Pulsar implements a "two-container" architecture per pod, where 
+one container stages job execution environment (`pulsar-container`)
+and another container encompasses tool's executables (`tool-container`).
+
+Note that this architecture is experimental and under active development, 
+it is increasingly improved and it will soon be production-grade ready.
+
+In order to setup Galaxy to use the "two-container" architecture, you may 
+take the following steps: 
+
+1. In the `galaxy.yml` set the following attributes: 
+
+- `job_config_file: job_conf.yml`
+- Appropriately configure `galaxy_infrastructure_url`; for example, 
+set it as the following on macOS: 
+`galaxy_infrastructure_url: 'http://host.docker.internal:$UWSGI_PORT'`
+
+2. In the `job_conf.yml` set the following runners and execution attributes appropriately: 
+
+```yaml
+runners:
+  local:
+    load: galaxy.jobs.runners.local:LocalJobRunner
+    workers: 1
+  pulsar_k8s:
+    load: galaxy.jobs.runners.pulsar:PulsarKubernetesJobRunner
+    amqp_url: amqp://guest:guest@localhost:5672//
+
+execution:
+  default: pulsar_k8s_environment
+  environments:
+    pulsar_k8s_environment:
+      k8s_config_path: ~/.kube/config
+      k8s_galaxy_instance_id: any-dns-friendly-random-str
+      k8s_namespace: default
+      runner: pulsar_k8s
+      docker_enabled: true
+      docker_default_container_id: busybox:ubuntu-14.04
+      pulsar_app_config:
+        message_queue_url: 'amqp://guest:guest@host.docker.internal:5672//'
+    local_environment:
+      runner: local
+```
+
 ### Macros
 
 The job configuration XML file may contain any number of macro definitions using the same
diff --git a/doc/source/admin/nginx.md b/doc/source/admin/nginx.md
index 0466a06154a..4e4f5364beb 100644
--- a/doc/source/admin/nginx.md
+++ b/doc/source/admin/nginx.md
@@ -364,7 +364,7 @@ nginx should serve files and edit `galaxy.yml` and make the following changes be
 ```yaml
 galaxy:
     #...
-    upstream_zip: true
+    upstream_mod_zip: true
 ```
 
 Instead of creating archives Galaxy will send a special header containing the list of files to be archived.
diff --git a/doc/source/conf.versioning.py b/doc/source/conf.versioning.py
index 0d5186e4375..fb8c7eb94b1 100644
--- a/doc/source/conf.versioning.py
+++ b/doc/source/conf.versioning.py
@@ -2,6 +2,7 @@
 # Galaxy sphinxcontrib-simpleversioning documentation build configuration file
 # This file is appended to conf.py by the Build docs github workflow.
 #
+import re
 from distutils.version import LooseVersion
 from subprocess import check_output
 
@@ -27,18 +28,13 @@ simpleversioning_path_template = '/en/{version}/{pagename}'
 simpleversioning_stable_version = 'master'
 simpleversioning_current_version = TARGET_GIT_BRANCH
 simpleversioning_versions = [
+    {'id': 'latest', 'name': 'dev'},
     {'id': 'master', 'name': 'stable'},
     # Additional versions added below
 ]
 
 # Used for determining the latest stable release so the banner can be added to older releases.
 _stable = None
-
-_target_ver = None
-_pre_release = False
-if TARGET_GIT_BRANCH.startswith('release_'):
-    _target_ver = TARGET_GIT_BRANCH[len('release_'):]
-
 # Use tags to determine versions - a stable version will have a branch before it's released, but not a tag.
 tags = check_output(('git', 'tag')).decode().splitlines()
 for _tag in reversed(tags):
@@ -47,29 +43,32 @@ for _tag in reversed(tags):
         _ver = _tag[1:]
         if not _stable:
             _stable = _ver
-            if _target_ver and LooseVersion(_target_ver) > LooseVersion(_ver):
-                # Pre-release
-                simpleversioning_versions.append(
-                    {'id': TARGET_GIT_BRANCH, 'name': _target_ver}
-                )
-                _pre_release = True
         if LooseVersion(_ver) >= MIN_DOC_VERSION:
             simpleversioning_versions.append(
                 {'id': 'release_%s' % _ver, 'name': _ver}
             )
 
-simpleversioning_versions.append(
-    {'id': 'latest', 'name': 'dev'},
-)
-
-if TARGET_GIT_BRANCH.startswith('release_'):
-    # The current stable release will go here but fail the next conditional, avoiding either banner.
-    if TARGET_GIT_BRANCH != 'release_%s' % _stable:
-        simpleversioning_show_banner = True
-        if _pre_release:
-            simpleversioning_banner_message = PRE_BANNER + BANNER_APPEND
-        else:
-            simpleversioning_banner_message = OLD_BANNER + BANNER_APPEND
+if re.fullmatch(r'release_\d{2}\.\d{2}', TARGET_GIT_BRANCH):
+    if _stable:
+        # The current stable release will go here but fail the next conditional, avoiding either banner.
+        if TARGET_GIT_BRANCH != 'release_%s' % _stable:
+            simpleversioning_show_banner = True
+            _target_ver = TARGET_GIT_BRANCH[len('release_'):]
+            if LooseVersion(_target_ver) > LooseVersion(_stable):
+                # Pre-release
+                # Insert it between master and _stable
+                simpleversioning_versions.insert(
+                    2,
+                    {'id': TARGET_GIT_BRANCH, 'name': _target_ver}
+                )
+                simpleversioning_banner_message = PRE_BANNER + BANNER_APPEND
+            else:
+                simpleversioning_banner_message = OLD_BANNER + BANNER_APPEND
 elif TARGET_GIT_BRANCH != 'master':
+    if TARGET_GIT_BRANCH != 'dev':
+        # Feature branch
+        simpleversioning_versions.append(
+            {'id': TARGET_GIT_BRANCH, 'name': TARGET_GIT_BRANCH}
+        )
     simpleversioning_show_banner = True
     simpleversioning_banner_message = DEV_BANNER + BANNER_APPEND
diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index eb69840d8a5..1549a7a9e82 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -2,7 +2,7 @@ import logging
 import signal
 import sys
 import time
-from typing import Any
+from typing import Any, Callable, List, Tuple
 
 from sqlalchemy.orm.scoping import (
     scoped_session,
@@ -70,19 +70,41 @@ from galaxy.web_stack import application_stack_instance, ApplicationStack
 from galaxy.webhooks import WebhooksRegistry
 from galaxy.workflow.trs_proxy import TrsProxy
 from .di import Container
-from .structured_app import BasicApp, StructuredApp
+from .structured_app import BasicApp, MinimalManagerApp, StructuredApp
 
 log = logging.getLogger(__name__)
 app = None
 
 
-class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container):
-    """Encapsulates the state of a Universe application"""
+class HaltableContainer(Container):
+    haltables: List[Tuple[str, Callable]]
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self) -> None:
         super().__init__()
+        self.haltables = []
+
+    def shutdown(self):
+        exception = None
+        for what, haltable in self.haltables:
+            try:
+                haltable()
+            except Exception as e:
+                log.exception(f"Failed to shutdown {what} cleanly")
+                exception = exception or e
+        if exception is not None:
+            raise exception
+
+
+class MinimalGalaxyApplication(BasicApp, config.ConfiguresGalaxyMixin, HaltableContainer):
+    """Encapsulates the state of a minimal Galaxy application"""
+
+    def __init__(self, fsmon=False, configure_logging=True, **kwargs) -> None:
+        super().__init__()
+        self.haltables = [
+            ("object store", self._shutdown_object_store),
+            ("database connection", self._shutdown_model),
+        ]
         self._register_singleton(BasicApp, self)
-        self._register_singleton(StructuredApp, self)
         if not log.handlers:
             # Paste didn't handle it, so we need a temporary basic log
             # configured.  The handler added here gets dumped and replaced with
@@ -91,38 +113,47 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
         log.debug("python path is: %s", ", ".join(sys.path))
         self.name = 'galaxy'
         self.is_webapp = False
-        startup_timer = ExecutionTimer()
         self.new_installation = False
         # Read config file and check for errors
         self.config: Any = self._register_singleton(config.Configuration, config.Configuration(**kwargs))
         self.config.check()
-        config.configure_logging(self.config)
-        self.execution_timer_factory = self._register_singleton(ExecutionTimerFactory, ExecutionTimerFactory(self.config))
-        self.configure_fluent_log()
-        # A lot of postfork initialization depends on the server name, ensure it is set immediately after forking before other postfork functions
-        self.application_stack = self._register_singleton(ApplicationStack, application_stack_instance(app=self))
-        self.application_stack.register_postfork_function(self.application_stack.set_postfork_server_name, self)
-        self.config.reload_sanitize_allowlist(explicit='sanitize_allowlist_file' in kwargs)
-        self.amqp_internal_connection_obj = galaxy.queues.connection_from_config(self.config)
-        # queue_worker *can* be initialized with a queue, but here we don't
-        # want to and we'll allow postfork to bind and start it.
-        self.queue_worker = self._register_singleton(GalaxyQueueWorker, GalaxyQueueWorker(self))
-
-        self._configure_tool_shed_registry()
+        if configure_logging:
+            config.configure_logging(self.config)
         self._configure_object_store(fsmon=True)
-        # Setup the database engine and ORM
         config_file = kwargs.get('global_conf', {}).get('__file__', None)
         if config_file:
             log.debug('Using "galaxy.ini" config file: %s', config_file)
         check_migrate_tools = self.config.check_migrate_tools
         self._configure_models(check_migrate_databases=self.config.check_migrate_databases, check_migrate_tools=check_migrate_tools, config_file=config_file)
-
         # Security helper
         self._configure_security()
         self._register_singleton(IdEncodingHelper, self.security)
         self._register_singleton(SharedModelMapping, self.model)
         self._register_singleton(GalaxyModelMapping, self.model)
         self._register_singleton(scoped_session, self.model.context)
+
+    def configure_fluent_log(self):
+        if self.config.fluent_log:
+            from galaxy.util.custom_logging.fluent_log import FluentTraceLogger
+            self.trace_logger = FluentTraceLogger('galaxy', self.config.fluent_host, self.config.fluent_port)
+        else:
+            self.trace_logger = None
+
+    def _shutdown_object_store(self):
+        self.object_store.shutdown()
+
+    def _shutdown_model(self):
+        self.model.engine.dispose()
+
+
+class GalaxyManagerApplication(MinimalManagerApp, MinimalGalaxyApplication):
+    """Extends the MinimalGalaxyApplication with most managers that are not tied to a web or job handling context."""
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._register_singleton(MinimalManagerApp, self)
+        self.execution_timer_factory = self._register_singleton(ExecutionTimerFactory, ExecutionTimerFactory(self.config))
+        self.configure_fluent_log()
+
         # Tag handler
         self.tag_handler = self._register_singleton(GalaxyTagHandler)
         self.user_manager = self._register_singleton(UserManager)
@@ -133,17 +164,66 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
         self.dataset_collections_service = self._register_singleton(DatasetCollectionManager)
         self.workflow_manager = self._register_singleton(WorkflowsManager)
         self.workflow_contents_manager = self._register_singleton(WorkflowContentsManager)
-        self.dependency_resolvers_view = self._register_singleton(DependencyResolversView, DependencyResolversView(self))
-        self.test_data_resolver = self._register_singleton(TestDataResolver, TestDataResolver(file_dirs=self.config.tool_test_data_directories))
         self.library_folder_manager = self._register_singleton(FolderManager)
         self.library_manager = self._register_singleton(LibraryManager)
         self.role_manager = self._register_singleton(RoleManager)
-        self.dynamic_tool_manager = self._register_singleton(DynamicToolManager)
-        self.api_keys_manager = self._register_singleton(ApiKeyManager)
 
         # ConfiguredFileSources
         self.file_sources = self._register_singleton(ConfiguredFileSources, ConfiguredFileSources.from_app_config(self.config))
 
+        # We need the datatype registry for running certain tasks that modify HDAs, and to build the registry we need
+        # to setup the installed repositories ... this is not ideal
+        self._configure_tool_config_files()
+        self.installed_repository_manager = self._register_singleton(InstalledRepositoryManager, InstalledRepositoryManager(self))
+        self._configure_datatypes_registry(self.installed_repository_manager)
+        self._register_singleton(Registry, self.datatypes_registry)
+        galaxy.model.set_datatypes_registry(self.datatypes_registry)
+
+        self.sentry_client = None
+        if self.config.sentry_dsn:
+
+            def postfork_sentry_client():
+                import raven
+                self.sentry_client = raven.Client(self.config.sentry_dsn, transport=raven.transport.HTTPTransport)
+
+            self.application_stack.register_postfork_function(postfork_sentry_client)
+
+
+class UniverseApplication(StructuredApp, GalaxyManagerApplication):
+    """Encapsulates the state of a Universe application"""
+
+    def __init__(self, **kwargs) -> None:
+        startup_timer = ExecutionTimer()
+        super().__init__(fsmon=True, **kwargs)
+        self.haltables = [
+            ("queue worker", self._shutdown_queue_worker),
+            ("file watcher", self._shutdown_watcher),
+            ("database heartbeat", self._shutdown_database_heartbeat),
+            ("workflow scheduler", self._shutdown_scheduling_manager),
+            ("object store", self._shutdown_object_store),
+            ("job manager", self._shutdown_job_manager),
+            ("application heartbeat", self._shutdown_heartbeat),
+            ("repository manager", self._shutdown_repo_manager),
+            ("database connection", self._shutdown_model),
+            ("application stack", self._shutdown_application_stack),
+        ]
+        self._register_singleton(StructuredApp, self)
+        # A lot of postfork initialization depends on the server name, ensure it is set immediately after forking before other postfork functions
+        self.application_stack = self._register_singleton(ApplicationStack, application_stack_instance(app=self))
+        self.application_stack.register_postfork_function(self.application_stack.set_postfork_server_name, self)
+        self.config.reload_sanitize_allowlist(explicit='sanitize_allowlist_file' in kwargs)
+        self.amqp_internal_connection_obj = galaxy.queues.connection_from_config(self.config)
+        # queue_worker *can* be initialized with a queue, but here we don't
+        # want to and we'll allow postfork to bind and start it.
+        self.queue_worker = self._register_singleton(GalaxyQueueWorker, GalaxyQueueWorker(self))
+
+        self._configure_tool_shed_registry()
+
+        self.dependency_resolvers_view = self._register_singleton(DependencyResolversView, DependencyResolversView(self))
+        self.test_data_resolver = self._register_singleton(TestDataResolver, TestDataResolver(file_dirs=self.config.tool_test_data_directories))
+        self.dynamic_tool_manager = self._register_singleton(DynamicToolManager)
+        self.api_keys_manager = self._register_singleton(ApiKeyManager)
+
         # Tool Data Tables
         self._configure_tool_data_tables(from_shed_config=False)
         # Load dbkey / genome build manager
@@ -169,14 +249,7 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
         self.tool_shed_repository_cache = self._register_singleton(ToolShedRepositoryCache)
         # Watch various config files for immediate reload
         self.watchers = self._register_singleton(ConfigWatchers)
-        self._configure_tool_config_files()
-        self.installed_repository_manager = self._register_singleton(InstalledRepositoryManager, InstalledRepositoryManager(self))
-        self._configure_datatypes_registry(self.installed_repository_manager)
-        self._register_singleton(Registry, self.datatypes_registry)
-        galaxy.model.set_datatypes_registry(self.datatypes_registry)
-
         self._configure_toolbox()
-
         # Load Data Manager
         self.data_managers = self._register_singleton(DataManagers)
         # Load the update repository manager.
@@ -231,16 +304,6 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
             self.authnz_manager = managers.AuthnzManager(self,
                                                          self.config.oidc_config_file,
                                                          self.config.oidc_backends_config_file)
-
-        self.sentry_client = None
-        if self.config.sentry_dsn:
-
-            def postfork_sentry_client():
-                import raven
-                self.sentry_client = raven.Client(self.config.sentry_dsn, transport=raven.transport.HTTPTransport)
-
-            self.application_stack.register_postfork_function(postfork_sentry_client)
-
         # Start the job manager
         from galaxy.jobs import manager
         self.job_manager = self._register_singleton(manager.JobManager)
@@ -284,8 +347,6 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
         # Delay toolbox index until after startup
         self.application_stack.register_postfork_function(lambda: send_local_control_task(self, 'rebuild_toolbox_search_index'))
 
-        self.model.engine.dispose()
-
         # Inject url_for for components to more easily optionally depend
         # on url_for.
         self.url_for = url_for
@@ -293,74 +354,30 @@ class UniverseApplication(StructuredApp, config.ConfiguresGalaxyMixin, Container
         self.server_starttime = int(time.time())  # used for cachebusting
         log.info("Galaxy app startup finished %s" % startup_timer)
 
-    def shutdown(self):
-        log.debug('Shutting down')
-        exception = None
-        try:
-            self.queue_worker.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown control worker cleanly")
-        try:
-            self.watchers.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown configuration watchers cleanly")
-        try:
-            self.database_heartbeat.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown database heartbeat cleanly")
-        try:
-            self.workflow_scheduling_manager.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown workflow scheduling manager cleanly")
-        try:
-            self.job_manager.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown job manager cleanly")
-        try:
-            self.object_store.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown object store cleanly")
-        try:
-            if self.heartbeat:
-                self.heartbeat.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown heartbeat cleanly")
-        try:
-            self.update_repository_manager.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown update repository manager cleanly")
+    def _shutdown_queue_worker(self):
+        self.queue_worker.shutdown()
 
-        try:
-            self.model.engine.dispose()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown SA database engine cleanly")
+    def _shutdown_watcher(self):
+        self.watchers.shutdown()
 
-        try:
-            self.application_stack.shutdown()
-        except Exception as e:
-            exception = exception or e
-            log.exception("Failed to shutdown application stack interface cleanly")
+    def _shutdown_database_heartbeat(self):
+        self.database_heartbeat.shutdown()
 
-        if exception:
-            raise exception
-        else:
-            log.debug('Finished shutting down')
+    def _shutdown_scheduling_manager(self):
+        self.workflow_scheduling_manager.shutdown()
 
-    def configure_fluent_log(self):
-        if self.config.fluent_log:
-            from galaxy.util.custom_logging.fluent_log import FluentTraceLogger
-            self.trace_logger = FluentTraceLogger('galaxy', self.config.fluent_host, self.config.fluent_port)
-        else:
-            self.trace_logger = None
+    def _shutdown_job_manager(self):
+        self.job_manager.shutdown()
+
+    def _shutdown_heartbeat(self):
+        if self.heartbeat:
+            self.heartbeat.shutdown()
+
+    def _shutdown_repo_manager(self):
+        self.update_repository_manager.shutdown()
+
+    def _shutdown_application_stack(self):
+        self.application_stack.shutdown()
 
     @property
     def is_job_handler(self) -> bool:
diff --git a/lib/galaxy/celery/__init__.py b/lib/galaxy/celery/__init__.py
new file mode 100644
index 00000000000..59d4bc410c7
--- /dev/null
+++ b/lib/galaxy/celery/__init__.py
@@ -0,0 +1,55 @@
+import os
+from functools import lru_cache
+
+from celery import Celery
+
+from galaxy.config import Configuration
+from galaxy.util.custom_logging import get_logger
+from galaxy.util.properties import load_app_properties
+
+log = get_logger(__name__)
+
+
+@lru_cache(maxsize=1)
+def get_galaxy_app():
+    import galaxy.app
+    if galaxy.app.app:
+        return galaxy.app.app
+    kwargs = get_app_properties()
+    if kwargs:
+        kwargs['check_migrate_tools'] = False
+        kwargs['check_migrate_databases'] = False
+        galaxy_app = galaxy.app.GalaxyManagerApplication(configure_logging=False, **kwargs)
+        return galaxy_app
+
+
+@lru_cache(maxsize=1)
+def get_app_properties():
+    config_file = os.environ.get("GALAXY_CONFIG_FILE")
+    if config_file:
+        return load_app_properties(
+            config_file=os.path.abspath(config_file),
+            config_section='galaxy',
+        )
+
+
+@lru_cache(maxsize=1)
+def get_config():
+    kwargs = get_app_properties()
+    if kwargs:
+        kwargs['override_tempdir'] = False
+        return Configuration(**kwargs)
+
+
+def get_broker():
+    config = get_config()
+    if config:
+        return config.amqp_internal_connection
+
+
+broker = get_broker()
+celery_app = Celery('galaxy', broker=broker, include=['galaxy.celery.tasks'])
+
+
+if __name__ == '__main__':
+    celery_app.start()
diff --git a/lib/galaxy/celery/tasks.py b/lib/galaxy/celery/tasks.py
new file mode 100644
index 00000000000..5f0f02e0a22
--- /dev/null
+++ b/lib/galaxy/celery/tasks.py
@@ -0,0 +1,51 @@
+from lagom import magic_bind_to_container
+from sqlalchemy.orm.scoping import (
+    scoped_session,
+)
+
+from galaxy.celery import celery_app
+from galaxy.managers.hdas import HDAManager
+from galaxy.managers.lddas import LDDAManager
+from galaxy.model import User
+from galaxy.util.custom_logging import get_logger
+from . import get_galaxy_app
+
+log = get_logger(__name__)
+
+
+def galaxy_task(func):
+    app = get_galaxy_app()
+    if app:
+        return magic_bind_to_container(app)(func)
+    return func
+
+
+@celery_app.task(ignore_result=True)
+@galaxy_task
+def recalculate_user_disk_usage(session: scoped_session, user_id=None):
+    if user_id:
+        user = session.query(User).get(user_id)
+        if user:
+            user.calculate_and_set_disk_usage()
+            log.info(f"New user disk usage is {user.disk_usage}")
+        else:
+            log.error("Recalculate user disk usage task failed, user %s not found" % user_id)
+    else:
+        log.error("Recalculate user disk usage task received without user_id.")
+
+
+@celery_app.task(ignore_result=True)
+@galaxy_task
+def purge_hda(hda_manager: HDAManager, hda_id):
+    hda = hda_manager.by_id(hda_id)
+    hda_manager._purge(hda)
+
+
+@celery_app.task
+@galaxy_task
+def set_metadata(hda_manager: HDAManager, ldda_manager: LDDAManager, dataset_id, model_class='HistoryDatasetAssociation'):
+    if model_class == 'HistoryDatasetAssociation':
+        dataset = hda_manager.by_id(dataset_id)
+    elif model_class == 'LibraryDatasetDatasetAssociation':
+        dataset = ldda_manager.by_id(dataset_id)
+    dataset.datatype.set_meta(dataset)
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index 584cd993d97..0c751f3e595 100644
--- a/lib/galaxy/config/__init__.py
+++ b/lib/galaxy/config/__init__.py
@@ -29,6 +29,7 @@ from galaxy.config.schema import AppSchema
 from galaxy.containers import parse_containers_config
 from galaxy.exceptions import ConfigurationError
 from galaxy.model import mapping
+from galaxy.model.database_utils import database_exists
 from galaxy.model.tool_shed_install.migrate.check import create_or_verify_database as tsi_create_or_verify_database
 from galaxy.util import (
     ExecutionTimer,
@@ -124,7 +125,7 @@ class BaseAppConfiguration:
     listify_options: Set[str] = set()  # values for these options are processed as lists of values
 
     def __init__(self, **kwargs):
-        self._process_renamed_options(kwargs)
+        self._preprocess_kwargs(kwargs)
         self._kwargs = kwargs  # Save these as a record of explicitly set options
         self.config_dict = kwargs
         self.root = find_root(kwargs)
@@ -137,6 +138,10 @@ class BaseAppConfiguration:
         self._resolve_paths()  # Overwrite attribute values with resolved paths
         self._postprocess_paths_to_resolve()  # Any steps that need to happen after paths are resolved
 
+    def _preprocess_kwargs(self, kwargs):
+        self._process_renamed_options(kwargs)
+        self._fix_postgresql_dburl(kwargs)
+
     def _process_renamed_options(self, kwargs):
         """Update kwargs to set any unset renamed options to values of old-named options, if set.
 
@@ -147,6 +152,25 @@ class BaseAppConfiguration:
                 if old in kwargs and new not in kwargs:
                     kwargs[new] = kwargs[old]
 
+    def _fix_postgresql_dburl(self, kwargs):
+        """
+        Fix deprecated database URLs (postgres... >> postgresql...)
+        https://docs.sqlalchemy.org/en/14/changelog/changelog_14.html#change-3687655465c25a39b968b4f5f6e9170b
+        """
+        old_dialect, new_dialect = 'postgres', 'postgresql'
+        old_prefixes = (f'{old_dialect}:', f'{old_dialect}+')  # check for postgres://foo and postgres+driver//foo
+        offset = len(old_dialect)
+        keys = ('database_connection', 'install_database_connection')
+        for key in keys:
+            if key in kwargs:
+                value = kwargs[key]
+                for prefix in old_prefixes:
+                    if value.startswith(prefix):
+                        value = f'{new_dialect}{value[offset:]}'
+                        kwargs[key] = value
+                        log.warning('PostgreSQL database URLs of the form "postgres://" have been '
+                            'deprecated. Please use "postgresql://".')
+
     def is_set(self, key):
         """Check if a configuration option has been explicitly set."""
         # NOTE: This will check all supplied keyword arguments, including those not in the schema.
@@ -530,7 +554,11 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
         self._process_config(kwargs)
 
     def _load_schema(self):
-        return AppSchema(GALAXY_CONFIG_SCHEMA_PATH, GALAXY_APP_NAME)
+        # Schemas are symlinked to the root of the galaxy-app package
+        config_schema_path = os.path.join(os.path.dirname(__file__), os.pardir, 'config_schema.yml')
+        if os.path.exists(GALAXY_CONFIG_SCHEMA_PATH):
+            config_schema_path = GALAXY_CONFIG_SCHEMA_PATH
+        return AppSchema(config_schema_path, GALAXY_APP_NAME)
 
     def _override_tempdir(self, kwargs):
         if string_as_bool(kwargs.get("override_tempdir", "True")):
@@ -1270,7 +1298,6 @@ class ConfiguresGalaxyMixin:
             signal.signal(sig, handler)
 
     def _wait_for_database(self, url):
-        from sqlalchemy_utils import database_exists
         attempts = self.config.database_wait_attempts
         pause = self.config.database_wait_sleep
         for i in range(1, attempts):
diff --git a/lib/galaxy/config/config_manage.py b/lib/galaxy/config/config_manage.py
index 8ebe0585cd9..da8c5bbf0ce 100644
--- a/lib/galaxy/config/config_manage.py
+++ b/lib/galaxy/config/config_manage.py
@@ -351,7 +351,7 @@ GALAXY_APP = App(
 SHED_APP = App(
     ["tool_shed_wsgi.ini", "config/tool_shed.ini"],
     "9009",
-    ["galaxy.webapps.tool_shed.buildapp:app_factory"],
+    ["tool_shed.webapp.buildapp:app_factory"],
     "config/tool_shed.yml",
     "lib/tool_shed/webapp/config_schema.yml",
     'tool_shed.webapp.buildapp:uwsgi_app()',
diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample
index f51132986df..773787d844e 100644
--- a/lib/galaxy/config/sample/datatypes_conf.xml.sample
+++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample
@@ -197,6 +197,7 @@
     <datatype extension="gatk_dbsnp" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
     <datatype extension="gatk_tranche" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
     <datatype extension="gatk_recal" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true"/>
+    <datatype extension="hhr" type="galaxy.datatypes.data:Text" subclass="true" display_in_upload="true"/>
     <datatype extension="jpg" type="galaxy.datatypes.images:Jpg" mimetype="image/jpeg"/>
     <datatype extension="tiff" type="galaxy.datatypes.images:Tiff" mimetype="image/tiff" display_in_upload="true"/>
     <datatype extension="tf2" type="galaxy.datatypes.images:Tiff" subclass="true" display_in_upload="false"/>
@@ -267,6 +268,7 @@
     <datatype extension="mztab2" type="galaxy.datatypes.proteomics:MzTab2" display_in_upload="true"/>
     <datatype extension="mzml" type="galaxy.datatypes.proteomics:MzML" mimetype="application/xml" display_in_upload="true"/>
     <datatype extension="nmrml" type="galaxy.datatypes.proteomics:NmrML" mimetype="application/xml" display_in_upload="true" description="nmrML is an open mark-up language for NMR data." description_url="http://nmrml.org/schema/"/>
+    <datatype extension="meryldb" type="galaxy.datatypes.binary:Meryldb" subclass="true" display_in_upload="true" description="MerylDB is a tar.gz archive containing 64 binaries + 64 indexes." />
     <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf" display_in_upload="true"/>
     <datatype extension="wiff" type="galaxy.datatypes.proteomics:Wiff" display_in_upload="true"/>
     <datatype extension="mzxml" type="galaxy.datatypes.proteomics:MzXML" mimetype="application/xml" display_in_upload="true"/>
@@ -313,6 +315,7 @@
     <datatype extension="gii" auto_compressed_types="gz" type="galaxy.datatypes.images:Gifti" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="tck" type="galaxy.datatypes.images:Tck" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="trk" type="galaxy.datatypes.images:Trk" mimetype="application/octet-stream" display_in_upload="true" />
+    <datatype extension="mrc" type="galaxy.datatypes.images:Mrc2014" mimetype="application/octet-stream" display_in_upload="true" />
     <datatype extension="peff" type="galaxy.datatypes.proteomics:PEFF" display_in_upload="true" />
     <!-- End Proteomics Datatypes -->
     <!-- FlowCytometry -->
@@ -852,6 +855,7 @@
     <datatype extension="par" type="galaxy.datatypes.speech:BPF" display_in_upload="true" mimetype="text/plain-bas"/>
     <datatype extension="ffindex" type="galaxy.datatypes.tabular:Tabular" display_in_upload="true" subclass="true" description_url="https://github.com/soedinglab/ffindex_soedinglab"/>
     <datatype extension="ffdata" type="galaxy.datatypes.data:Data" display_in_upload="true" subclass="true" description_url="https://github.com/soedinglab/ffindex_soedinglab"/>
+    <datatype extension="pretext" type="galaxy.datatypes.binary:Pretext" display_in_upload="true" />
   </registration>
   <sniffers>
     <!--
@@ -923,6 +927,7 @@
     <sniffer type="galaxy.datatypes.binary:Fast5ArchiveGz"/>
     <sniffer type="galaxy.datatypes.binary:Fast5ArchiveBz2"/>
     <sniffer type="galaxy.datatypes.binary:Fast5Archive"/>
+    <sniffer type="galaxy.datatypes.binary:Meryldb" />
     <sniffer type="galaxy.datatypes.binary:PostgresqlArchive"/>
     <sniffer type="galaxy.datatypes.binary:ICM"/>
     <sniffer type="galaxy.datatypes.binary:Idat"/>
@@ -934,6 +939,7 @@
     <sniffer type="galaxy.datatypes.binary:Vel"/>
     <sniffer type="galaxy.datatypes.binary:Xlsx"/>
     <sniffer type="galaxy.datatypes.binary:CompressedZipArchive"/>
+    <sniffer type="galaxy.datatypes.binary:Pretext"/>
     <sniffer type="galaxy.datatypes.annotation:Augustus"/>
     <sniffer type="galaxy.datatypes.triples:Rdf"/>
     <sniffer type="galaxy.datatypes.blast:BlastXml"/>
@@ -1048,6 +1054,7 @@
     <sniffer type="galaxy.datatypes.microarrays:Gpr"/>
     <sniffer type="galaxy.datatypes.microarrays:Gal"/>
     <sniffer type="galaxy.datatypes.binary:RData"/>
+    <sniffer type="galaxy.datatypes.images:Mrc2014"/>
     <sniffer type="galaxy.datatypes.images:Jpg"/>
     <sniffer type="galaxy.datatypes.images:Png"/>
     <sniffer type="galaxy.datatypes.images:OMETiff"/>
diff --git a/lib/galaxy/config/sample/file_sources_conf.yml.sample b/lib/galaxy/config/sample/file_sources_conf.yml.sample
index 1a8be4e449c..07d82f6f74f 100644
--- a/lib/galaxy/config/sample/file_sources_conf.yml.sample
+++ b/lib/galaxy/config/sample/file_sources_conf.yml.sample
@@ -18,3 +18,19 @@
   label: Posix
   doc: Files from local path
   root: /some/path/
+
+- type: s3fs
+  label: My MinIO storage
+  endpoint_url: "https://minio.usegalaxy.eu"
+  id: galaxy-minio-storage
+  doc: Galaxy MinIO S3 storage
+  anon: false
+  secret: "UHAJ6asd6asdhasd"
+  key: "MCJU76agdt98GGFAROIP7"
+
+- type: s3fs
+  label: CMIP6 GCMs downscaled using WRF
+  id: wrf-cmip6-noversioning
+  doc: High-resolution historical and future climate simulations from 1980-2100
+  bucket: wrf-cmip6-noversioning
+  anon: true
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 42d68edc843..a65ad1df8fb 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -1684,6 +1684,13 @@ galaxy:
   # disable any such maximum.
   #maximum_workflow_jobs_per_scheduling_iteration: 1000
 
+  # Maximum number of datasets to create before flushing created
+  # datasets to database. This affects tools that create many output
+  # datasets. Higher values will lead to fewer database flushes and
+  # faster execution, but require more memory. Set to -1 to disable
+  # creating datasets in batches.
+  #flush_per_n_datasets: 1000
+
   # Force serial scheduling of workflows within the context of a
   # particular history
   #history_local_serial_workflow_scheduling: false
@@ -2152,6 +2159,11 @@ galaxy:
   # commented out line below).
   #amqp_internal_connection: sqlalchemy+sqlite:///./database/control.sqlite?isolation_level=IMMEDIATE
 
+  # Offload long-running tasks to a Celery task queue. Activate this
+  # only if you have setup a Celery worker for Galaxy. For details, see
+  # https://docs.galaxyproject.org/en/master/admin/production.html
+  #enable_celery_tasks: false
+
   # Allow disabling pbkdf2 hashing of passwords for legacy situations.
   # This should normally be left enabled unless there is a specific
   # reason to disable it.
diff --git a/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample b/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
index b63fe294943..464696a5929 100644
--- a/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
+++ b/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
@@ -59,10 +59,11 @@ preferences:
               required: False
               options:
                   - [Navigator default, auto]
-                  - [Chinese, zh]
+                  - [中文, zh]
                   - [English, en]
-                  - [French, fr]
-                  - [Japanese, ja]
+                  - [Español, es]
+                  - [Français, fr]
+                  - [日本語, ja]
 
     # Used in file_sources_conf.yml
     dropbox:
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
index 3ee97c9ac75..81baafa581a 100644
--- a/lib/galaxy/datatypes/binary.py
+++ b/lib/galaxy/datatypes/binary.py
@@ -201,6 +201,34 @@ class CompressedArchive(Binary):
             return "Compressed binary file (%s)" % (nice_size(dataset.get_size()))
 
 
+class Meryldb(CompressedArchive):
+    """MerylDB is a tar.gz archive, with 128 files. 64 data files and 64 index files."""
+    file_ext = "meryldb"
+
+    def sniff(self, filename):
+        """
+        Try to guess if the file is a Cel file.
+        >>> from galaxy.datatypes.sniff import get_test_fname
+        >>> fname = get_test_fname('affy_v_agcc.cel')
+        >>> Meryldb().sniff(fname)
+        False
+        >>> fname = get_test_fname('read-db.meryldb')
+        >>> Meryldb().sniff(fname)
+        True
+        """
+        try:
+            if filename and tarfile.is_tarfile(filename):
+                with tarfile.open(filename, 'r') as temptar:
+                    _tar_content = temptar.getnames()
+                    # 64 data files ad 64 indices + 2 folders
+                    if len(_tar_content) == 130:
+                        if len([_ for _ in _tar_content if _.endswith('.merylIndex')]) == 64:
+                            return True
+        except Exception as e:
+            log.warning('%s, sniff Exception: %s', self, e)
+        return False
+
+
 class DynamicCompressedArchive(CompressedArchive):
 
     def matches_any(self, target_datatypes):
@@ -2903,6 +2931,37 @@ class WiffTar(BafTar):
         return "Sciex WIFF/SCAN archive"
 
 
+@build_sniff_from_prefix
+class Pretext(Binary):
+    """
+    PretextMap contact map file
+    Try to guess if the file is a Pretext file.
+    >>> from galaxy.datatypes.sniff import get_test_fname
+    >>> fname = get_test_fname('sample.pretext')
+    >>> Pretext().sniff(fname)
+    True
+    """
+
+    def sniff_prefix(self, sniff_prefix):
+        # The first 4 bytes of any pretext file is 'pstm', and the rest of the
+        # file contains binary data.
+        return sniff_prefix.startswith_bytes(b'pstm')
+
+    def set_peek(self, dataset, is_multi_byte=False):
+        if not dataset.dataset.purged:
+            dataset.peek = "Binary pretext file"
+            dataset.blurb = nice_size(dataset.get_size())
+        else:
+            dataset.peek = 'file does not exist'
+            dataset.blurb = 'file purged from disk'
+
+    def display_peek(self, dataset):
+        try:
+            return dataset.peek
+        except Exception:
+            return "Binary pretext file (%s)" % (nice_size(dataset.get_size()))
+
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod(sys.modules[__name__])
diff --git a/display_applications/biom/biom_simple.xml b/lib/galaxy/datatypes/display_applications/configs/biom/biom_simple.xml
similarity index 100%
rename from display_applications/biom/biom_simple.xml
rename to lib/galaxy/datatypes/display_applications/configs/biom/biom_simple.xml
diff --git a/display_applications/ensembl/ensembl_bam.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_bam.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_bam.xml
diff --git a/display_applications/ensembl/ensembl_gff.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_gff.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_gff.xml
diff --git a/display_applications/ensembl/ensembl_interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_interval_as_bed.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_interval_as_bed.xml
diff --git a/display_applications/gbrowse/gbrowse_gff.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_gff.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_gff.xml
diff --git a/display_applications/gbrowse/gbrowse_interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_interval_as_bed.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_interval_as_bed.xml
diff --git a/display_applications/gbrowse/gbrowse_wig.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_wig.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_wig.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_wig.xml
diff --git a/display_applications/icn3d/icn3d_simple.xml b/lib/galaxy/datatypes/display_applications/configs/icn3d/icn3d_simple.xml
similarity index 100%
rename from display_applications/icn3d/icn3d_simple.xml
rename to lib/galaxy/datatypes/display_applications/configs/icn3d/icn3d_simple.xml
diff --git a/display_applications/igb/bam.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bam.xml
similarity index 100%
rename from display_applications/igb/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bam.xml
diff --git a/display_applications/igb/bb.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bb.xml
similarity index 100%
rename from display_applications/igb/bb.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bb.xml
diff --git a/display_applications/igb/bed.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bed.xml
similarity index 100%
rename from display_applications/igb/bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bed.xml
diff --git a/display_applications/igb/bedgraph.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bedgraph.xml
similarity index 100%
rename from display_applications/igb/bedgraph.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bedgraph.xml
diff --git a/display_applications/igb/bigwig.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bigwig.xml
similarity index 100%
rename from display_applications/igb/bigwig.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bigwig.xml
diff --git a/display_applications/igb/gtf.xml b/lib/galaxy/datatypes/display_applications/configs/igb/gtf.xml
similarity index 100%
rename from display_applications/igb/gtf.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/gtf.xml
diff --git a/display_applications/igb/wig.xml b/lib/galaxy/datatypes/display_applications/configs/igb/wig.xml
similarity index 100%
rename from display_applications/igb/wig.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/wig.xml
diff --git a/display_applications/igv/bam.xml b/lib/galaxy/datatypes/display_applications/configs/igv/bam.xml
similarity index 100%
rename from display_applications/igv/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/bam.xml
diff --git a/display_applications/igv/bigwig.xml b/lib/galaxy/datatypes/display_applications/configs/igv/bigwig.xml
similarity index 100%
rename from display_applications/igv/bigwig.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/bigwig.xml
diff --git a/display_applications/igv/genbank.xml b/lib/galaxy/datatypes/display_applications/configs/igv/genbank.xml
similarity index 100%
rename from display_applications/igv/genbank.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/genbank.xml
diff --git a/display_applications/igv/genome_fasta.xml b/lib/galaxy/datatypes/display_applications/configs/igv/genome_fasta.xml
similarity index 100%
rename from display_applications/igv/genome_fasta.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/genome_fasta.xml
diff --git a/display_applications/igv/gff.xml b/lib/galaxy/datatypes/display_applications/configs/igv/gff.xml
similarity index 100%
rename from display_applications/igv/gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/gff.xml
diff --git a/display_applications/igv/interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/igv/interval_as_bed.xml
similarity index 100%
rename from display_applications/igv/interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/interval_as_bed.xml
diff --git a/display_applications/igv/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/igv/vcf.xml
similarity index 100%
rename from display_applications/igv/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/vcf.xml
diff --git a/display_applications/image/avivator.xml b/lib/galaxy/datatypes/display_applications/configs/image/avivator.xml
similarity index 100%
rename from display_applications/image/avivator.xml
rename to lib/galaxy/datatypes/display_applications/configs/image/avivator.xml
diff --git a/display_applications/intermine/intermine_simple.xml b/lib/galaxy/datatypes/display_applications/configs/intermine/intermine_simple.xml
similarity index 100%
rename from display_applications/intermine/intermine_simple.xml
rename to lib/galaxy/datatypes/display_applications/configs/intermine/intermine_simple.xml
diff --git a/display_applications/iobio/bam.xml b/lib/galaxy/datatypes/display_applications/configs/iobio/bam.xml
similarity index 100%
rename from display_applications/iobio/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/iobio/bam.xml
diff --git a/display_applications/iobio/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/iobio/vcf.xml
similarity index 100%
rename from display_applications/iobio/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/iobio/vcf.xml
diff --git a/display_applications/rviewer/bed.xml b/lib/galaxy/datatypes/display_applications/configs/rviewer/bed.xml
similarity index 100%
rename from display_applications/rviewer/bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/rviewer/bed.xml
diff --git a/display_applications/rviewer/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/rviewer/vcf.xml
similarity index 100%
rename from display_applications/rviewer/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/rviewer/vcf.xml
diff --git a/display_applications/ucsc/bam.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bam.xml
similarity index 100%
rename from display_applications/ucsc/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bam.xml
diff --git a/display_applications/ucsc/bigbed.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bigbed.xml
similarity index 100%
rename from display_applications/ucsc/bigbed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bigbed.xml
diff --git a/display_applications/ucsc/bigwig.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bigwig.xml
similarity index 100%
rename from display_applications/ucsc/bigwig.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bigwig.xml
diff --git a/display_applications/ucsc/interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/interval_as_bed.xml
similarity index 100%
rename from display_applications/ucsc/interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/interval_as_bed.xml
diff --git a/display_applications/ucsc/maf_customtrack.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/maf_customtrack.xml
similarity index 100%
rename from display_applications/ucsc/maf_customtrack.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/maf_customtrack.xml
diff --git a/display_applications/ucsc/trackhub.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/trackhub.xml
similarity index 100%
rename from display_applications/ucsc/trackhub.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/trackhub.xml
diff --git a/display_applications/ucsc/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/vcf.xml
similarity index 100%
rename from display_applications/ucsc/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/vcf.xml
diff --git a/lib/galaxy/datatypes/images.py b/lib/galaxy/datatypes/images.py
index 7fa5bccdb68..df5aa0587e6 100644
--- a/lib/galaxy/datatypes/images.py
+++ b/lib/galaxy/datatypes/images.py
@@ -5,8 +5,10 @@ import base64
 import json
 import logging
 import zipfile
+from io import StringIO
 from urllib.parse import quote_plus
 
+import mrcfile
 import numpy as np
 import tifffile
 
@@ -313,6 +315,35 @@ class Trk(Binary):
         return False
 
 
+class Mrc2014(Binary):
+    """
+    MRC/CCP4 2014 file format (.mrc).
+    https://www.ccpem.ac.uk/mrc_format/mrc2014.php
+
+    >>> from galaxy.datatypes.sniff import get_test_fname
+    >>> fname = get_test_fname('1.mrc')
+    >>> Mrc2014().sniff(fname)
+    True
+    >>> fname = get_test_fname('2.txt')
+    >>> Mrc2014().sniff(fname)
+    False
+    """
+    file_ext = 'mrc'
+
+    def sniff(self, filename):
+        # Handle the wierdness of mrcfile:
+        # https://github.com/ccpem/mrcfile/blob/master/mrcfile/validator.py#L88
+        try:
+            # An exception is thrown
+            # if the file is not an
+            # mrc2014 file.
+            if mrcfile.validate(filename, print_file=StringIO()):
+                return True
+        except Exception:
+            return False
+        return False
+
+
 class Gmaj(data.Data):
     """Class describing a GMAJ Applet"""
     edam_format = "format_3547"
diff --git a/lib/galaxy/datatypes/test/1.mrc b/lib/galaxy/datatypes/test/1.mrc
new file mode 100644
index 00000000000..54cc500af26
Binary files /dev/null and b/lib/galaxy/datatypes/test/1.mrc differ
diff --git a/lib/galaxy/datatypes/test/read-db.meryldb b/lib/galaxy/datatypes/test/read-db.meryldb
new file mode 100644
index 00000000000..354da28bc66
Binary files /dev/null and b/lib/galaxy/datatypes/test/read-db.meryldb differ
diff --git a/lib/galaxy/datatypes/test/sample.pretext b/lib/galaxy/datatypes/test/sample.pretext
new file mode 100644
index 00000000000..f2b08502fad
Binary files /dev/null and b/lib/galaxy/datatypes/test/sample.pretext differ
diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
index a4aa5cd62d3..9aa330cb583 100644
--- a/lib/galaxy/dependencies/conditional-requirements.txt
+++ b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -14,7 +14,7 @@ python-pam
 galaxycloudrunner
 
 # For file sources plugins
-fs.webdavfs  # type: webdav
+fs.webdavfs>=0.4.2  # type: webdav
 fs.dropboxfs  # type: dropbox
 fs.sshfs  # type: ssh
 fs-s3fs  # type: s3
diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index 7f828096e0d..73020b1aee7 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/lib/galaxy/dependencies/dev-requirements.txt
@@ -3,7 +3,7 @@
 adal==1.2.6
 aiofiles==0.6.0
 alabaster==0.7.12; python_version >= "3.5"
-amqp==5.0.5; python_version >= "3.6"
+amqp==5.0.6; python_version >= "3.6"
 appdirs==1.4.4; python_version >= "3.6"
 argcomplete==1.12.2; python_version >= "3.6" and python_version < "4"
 async-exit-stack==1.0.1; python_version >= "3.6" and python_version < "3.7"
@@ -15,8 +15,9 @@ babel==2.9.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (py
 bagit-profile==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 bagit==1.8.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
 bcrypt==3.2.0; python_version >= "3.6"
-bdbag==1.6.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
+bdbag==1.6.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
 beaker==1.11.0
+billiard==3.6.4.0; python_version >= "3.6"
 bioblend==0.15.0; python_version >= "3.6"
 bleach==3.3.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 boltons==20.2.1
@@ -27,11 +28,16 @@ bx-python==0.8.11; python_version >= "3.6"
 cachecontrol==0.11.7; python_version >= "3.6" and python_version < "4"
 cached-property==1.5.2; python_version < "3.8" and python_version >= "3.6"
 cachetools==4.2.1; python_version >= "3.5" and python_version < "4.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0")
+celery==5.0.5; python_version >= "3.6"
 certifi==2020.12.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
-cffi==1.14.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+cffi==1.14.5; implementation_name == "pypy" and python_version >= "3.6" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0")
 chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 cheetah3==3.2.6.post1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
-click==7.1.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+circus==0.17.1
+click-didyoumean==0.0.3; python_version >= "3.6"
+click-plugins==1.1.1; python_version >= "3.6"
+click-repl==0.1.6; python_version >= "3.6"
+click==7.1.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 cliff==3.7.0; python_version >= "3.6"
 cloudauthz==0.6.0
 cloudbridge==2.1.0
@@ -41,11 +47,11 @@ coloredlogs==15.0; python_version >= "3.6" and python_full_version < "3.0.0" and
 commonmark==0.9.1
 contextvars==2.4; python_version < "3.7" and python_version >= "3.6"
 coverage==5.5; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
-cryptography==3.4.6; python_version >= "3.6"
+cryptography==3.4.7; python_version >= "3.6"
 cwltool==3.0.20201109103151; python_version >= "3.6" and python_version < "4"
 dataclasses==0.8; python_version >= "3.6" and python_version < "3.7"
 debtcollector==2.2.0; python_version >= "3.6"
-decorator==4.4.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.2.0" and python_version >= "3.6"
+decorator==5.0.3; python_version >= "3.6"
 defusedxml==0.7.1; python_version >= "3.0" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.0"
 deprecated==1.2.12; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 deprecation==2.1.0
@@ -61,23 +67,23 @@ fluent-logger==0.10.0; python_version >= "3.5"
 funcsigs==1.0.2
 future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 galaxy-sequence-utils==1.1.5
-google-api-core==1.26.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
+google-api-core==1.26.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 google-api-python-client==1.12.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 google-auth-httplib2==0.1.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 google-auth==1.28.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 googleapis-common-protos==1.53.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
-gunicorn==20.0.4; python_version >= "3.4"
+gunicorn==20.1.0; python_version >= "3.5"
 gxformat2==0.15.0
 h11==0.12.0; python_version >= "3.6"
 h5py==3.1.0; python_version >= "3.6"
 httpcore==0.12.3; python_version >= "3.6"
-httplib2==0.19.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
+httplib2==0.19.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 httpx==0.17.1; python_version >= "3.6"
 humanfriendly==9.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0"
 idna==2.10; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
 imagesize==1.2.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5"
 immutables==0.15; python_version >= "3.6" and python_version < "3.7"
-importlib-metadata==3.7.3; python_version < "3.8" and python_version >= "3.6" and (python_version == "3.6" or python_version == "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.4.0" and python_version >= "3.6" and python_version < "3.8")
+importlib-metadata==3.10.0; python_version < "3.8" and python_version >= "3.6" and (python_version == "3.6" or python_version == "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.4.0" and python_version >= "3.6" and python_version < "3.8")
 importlib-resources==5.1.2; python_version < "3.7" and python_version >= "3.6"
 iniconfig==1.1.1; python_version >= "3.6"
 isa-rwval==0.10.10
@@ -90,9 +96,9 @@ jsonpointer==2.1; python_version >= "3.6" and python_full_version < "3.0.0" or p
 jsonschema==3.2.0
 keystoneauth1==4.3.1; python_version >= "3.6"
 kombu==5.0.2; python_version >= "3.6"
-lagom==1.1.0; python_version >= "3.6" and python_version < "4.0"
+lagom==1.2.0; python_version >= "3.6" and python_version < "4.0"
 lockfile==0.12.2; python_version >= "3.6" and python_version < "4"
-lxml==4.6.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+lxml==4.6.3; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 mako==1.1.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 markdown-it-reporter==0.0.2
 markdown==3.3.4; python_version >= "3.6"
@@ -100,6 +106,7 @@ markupsafe==1.1.1; (python_version >= "2.7" and python_full_version < "3.0.0") o
 mercurial==5.7.1
 mirakuru==2.3.0; python_version >= "3.6"
 mistune==0.8.4; python_version >= "3.6" and python_version < "4"
+mrcfile==1.2.0; python_version >= "3.6"
 msgpack==1.0.2; python_version >= "3.6"
 munch==2.5.0; python_version >= "3.6"
 mypy-extensions==0.4.3; python_version >= "3.6" and python_version < "4"
@@ -132,14 +139,15 @@ pbr==5.5.1; python_version >= "3.6"
 pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 port-for==0.4; python_version >= "3.6"
 prettytable==0.7.2; python_version >= "3.6"
-protobuf==3.15.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
+prompt-toolkit==3.0.3; python_version >= "3.6"
+protobuf==3.15.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 prov==1.5.1; python_version >= "3.6" and python_version < "4"
 psutil==5.8.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 pulsar-galaxy-lib==0.14.2
-py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or python_full_version >= "3.4.0" and python_version >= "3.6" and implementation_name == "pypy"
 pyasn1-modules==0.2.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 pyasn1==0.4.8; python_version >= "3.5" and python_version < "4"
-pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.6" and python_full_version >= "3.4.0"
 pycryptodome==3.10.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 pydantic==1.7.3; python_version >= "3.6" and python_version < "4.0"
 pydot==1.4.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.4.0"
@@ -178,6 +186,7 @@ python3-openid==3.2.0; python_version >= "3.0"
 pytz==2021.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6"
 pyuwsgi==2.0.19.1.post0
 pyyaml==5.4.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
+pyzmq==22.0.3; python_version >= "3.6"
 rdflib-jsonld==0.5.0; python_version >= "3.6" and python_version < "4"
 rdflib==4.2.2; python_version >= "3.6" and python_version < "4"
 recommonmark==0.7.1
@@ -187,14 +196,14 @@ requests-oauthlib==1.3.0; python_version >= "2.7" and python_full_version < "3.0
 requests-toolbelt==0.9.1; python_version >= "3.6"
 requests==2.25.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 requestsexceptions==1.4.0; python_version >= "3.6"
-responses==0.13.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+responses==0.13.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 rfc3986==1.4.0; python_version >= "3.6"
 routes==2.5.1
 rsa==4.7.2; python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6")
 ruamel.yaml.clib==0.2.2; platform_python_implementation == "CPython" and python_version < "3.8" and python_version >= "3.6"
 ruamel.yaml==0.16.5; python_version >= "3.6" and python_version < "4"
-s3transfer==0.3.4
-schema-salad==7.1.20210309094900; python_version >= "3.6" and python_version < "4"
+s3transfer==0.3.6
+schema-salad==7.1.20210316164414; python_version >= "3.6" and python_version < "4"
 selenium==3.141.0
 setuptools-scm==5.0.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 shellescape==3.4.1; python_version >= "3.6" and python_version < "4"
@@ -206,7 +215,7 @@ social-auth-core==3.3.0
 sortedcontainers==2.3.0
 sphinx-markdown-tables==0.0.15
 sphinx-rtd-theme==0.5.1
-sphinx==3.5.2; python_version >= "3.5"
+sphinx==3.5.3; python_version >= "3.5"
 sphinxcontrib-applehelp==1.0.2; python_version >= "3.5"
 sphinxcontrib-devhelp==1.0.2; python_version >= "3.5"
 sphinxcontrib-htmlhelp==1.0.3; python_version >= "3.5"
@@ -214,8 +223,7 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.5"
 sphinxcontrib-qthelp==1.0.3; python_version >= "3.5"
 sphinxcontrib-serializinghtml==1.1.4; python_version >= "3.5"
 sqlalchemy-migrate==0.13.0
-sqlalchemy-utils==0.36.7
-sqlalchemy==1.3.23; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
+sqlalchemy==1.3.24; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 sqlitedict==1.7.0
 sqlparse==0.4.1; python_version >= "3.5"
 starlette-context==0.3.1; python_version >= "3.7"
@@ -228,6 +236,7 @@ tenacity==7.0.0
 testfixtures==6.17.1
 tifffile==2020.9.3
 toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6"
+tornado==6.1; python_version >= "3.5"
 tqdm==4.59.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 twill==3.0
 typing-extensions==3.7.4.3; python_version >= "3.6" and python_version < "3.8"
@@ -245,6 +254,6 @@ webob==1.8.7; (python_version >= "2.7" and python_full_version < "3.0.0") or (py
 whoosh==2.7.4
 wrapt==1.12.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 xmlrunner==1.7.7
-yacman==0.8.0
+yacman==0.8.1
 zipp==3.4.1; python_version < "3.7" and python_version >= "3.6"
 zipstream-new==1.1.8
diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt
index 898c41871a3..cdb78a88ca2 100644
--- a/lib/galaxy/dependencies/pinned-lint-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt
@@ -1,13 +1,13 @@
 attrs==20.3.0
 flake8==3.9.0
-flake8-bugbear==21.3.2
+flake8-bugbear==21.4.3
 flake8-import-order==0.18.1
-importlib-metadata==3.7.3
+importlib-metadata==3.10.0
 mccabe==0.6.1
 mypy==0.790
 mypy-extensions==0.4.3
 pycodestyle==2.7.0
-pyflakes==2.3.0
+pyflakes==2.3.1
 typed-ast==1.4.2
 typing-extensions==3.7.4.3
 zipp==3.4.1
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index 90399d097fd..000d8452733 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -2,7 +2,7 @@
 
 adal==1.2.6
 aiofiles==0.6.0
-amqp==5.0.5; python_version >= "3.6"
+amqp==5.0.6; python_version >= "3.6"
 appdirs==1.4.4; python_version >= "3.6"
 argcomplete==1.12.2; python_version >= "3.6" and python_version < "4"
 async-exit-stack==1.0.1; python_version >= "3.6" and python_version < "3.7"
@@ -13,8 +13,9 @@ babel==2.9.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (py
 bagit-profile==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 bagit==1.8.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
 bcrypt==3.2.0; python_version >= "3.6"
-bdbag==1.6.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
+bdbag==1.6.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
 beaker==1.11.0
+billiard==3.6.4.0; python_version >= "3.6"
 bioblend==0.15.0; python_version >= "3.6"
 bleach==3.3.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 boltons==20.2.1
@@ -25,11 +26,16 @@ bx-python==0.8.11; python_version >= "3.6"
 cachecontrol==0.11.7; python_version >= "3.6" and python_version < "4"
 cached-property==1.5.2; python_version < "3.8" and python_version >= "3.6"
 cachetools==4.2.1; python_version >= "3.5" and python_version < "4.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0")
+celery==5.0.5; python_version >= "3.6"
 certifi==2020.12.5; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
-cffi==1.14.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+cffi==1.14.5; implementation_name == "pypy" and python_version >= "3.6" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0")
 chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 cheetah3==3.2.6.post1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
-click==7.1.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+circus==0.17.1
+click-didyoumean==0.0.3; python_version >= "3.6"
+click-plugins==1.1.1; python_version >= "3.6"
+click-repl==0.1.6; python_version >= "3.6"
+click==7.1.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 cliff==3.7.0; python_version >= "3.6"
 cloudauthz==0.6.0
 cloudbridge==2.1.0
@@ -37,11 +43,11 @@ cmd2==1.5.0; python_version >= "3.6"
 colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 coloredlogs==15.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0"
 contextvars==2.4; python_version >= "3.6" and python_version < "3.7"
-cryptography==3.4.6; python_version >= "3.6"
+cryptography==3.4.7; python_version >= "3.6"
 cwltool==3.0.20201109103151; python_version >= "3.6" and python_version < "4"
 dataclasses==0.8; python_version >= "3.6" and python_version < "3.7"
 debtcollector==2.2.0; python_version >= "3.6"
-decorator==4.4.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.2.0" and python_version >= "3.6"
+decorator==5.0.3; python_version >= "3.6"
 defusedxml==0.7.1; python_version >= "3.0" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.0"
 deprecation==2.1.0
 dictobj==0.4
@@ -55,7 +61,7 @@ fastapi==0.63.0; python_version >= "3.6"
 funcsigs==1.0.2
 future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 galaxy-sequence-utils==1.1.5
-google-api-core==1.26.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
+google-api-core==1.26.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 google-api-python-client==1.12.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 google-auth-httplib2==0.1.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 google-auth==1.28.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
@@ -63,11 +69,11 @@ googleapis-common-protos==1.53.0; python_version >= "3.6" and python_full_versio
 gxformat2==0.15.0
 h11==0.12.0; python_version >= "3.6"
 h5py==3.1.0; python_version >= "3.6"
-httplib2==0.19.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
+httplib2==0.19.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 humanfriendly==9.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0"
 idna==2.10; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
 immutables==0.15; python_version >= "3.6" and python_version < "3.7"
-importlib-metadata==3.7.3; python_version < "3.8" and python_version >= "3.6" and (python_version == "3.6" or python_version == "3.7")
+importlib-metadata==3.10.0; python_version < "3.8" and python_version >= "3.6" and (python_version == "3.6" or python_version == "3.7")
 importlib-resources==5.1.2; python_version < "3.7" and python_version >= "3.6"
 isa-rwval==0.10.10
 iso8601==0.1.14; python_version >= "3.6"
@@ -78,14 +84,15 @@ jsonpointer==2.1; python_version >= "3.6" and python_full_version < "3.0.0" or p
 jsonschema==3.2.0
 keystoneauth1==4.3.1; python_version >= "3.6"
 kombu==5.0.2; python_version >= "3.6"
-lagom==1.1.0; python_version >= "3.6" and python_version < "4.0"
+lagom==1.2.0; python_version >= "3.6" and python_version < "4.0"
 lockfile==0.12.2; python_version >= "3.6" and python_version < "4"
-lxml==4.6.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+lxml==4.6.3; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 mako==1.1.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 markdown==3.3.4; python_version >= "3.6"
 markupsafe==1.1.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 mercurial==5.7.1
 mistune==0.8.4; python_version >= "3.6" and python_version < "4"
+mrcfile==1.2.0; python_version >= "3.6"
 msgpack==1.0.2; python_version >= "3.6"
 munch==2.5.0; python_version >= "3.6"
 mypy-extensions==0.4.3; python_version >= "3.6" and python_version < "4"
@@ -115,13 +122,15 @@ paste==3.5.0
 pastedeploy==2.1.1
 pbr==5.5.1; python_version >= "3.6"
 prettytable==0.7.2; python_version >= "3.6"
-protobuf==3.15.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
+prompt-toolkit==3.0.3; python_version >= "3.6"
+protobuf==3.15.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 prov==1.5.1; python_version >= "3.6" and python_version < "4"
 psutil==5.8.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 pulsar-galaxy-lib==0.14.2
+py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.6" and python_full_version >= "3.4.0"
 pyasn1-modules==0.2.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 pyasn1==0.4.8; python_version >= "3.5" and python_version < "4"
-pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.6" and python_full_version >= "3.4.0"
 pycryptodome==3.10.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 pydantic==1.7.3; python_version >= "3.6" and python_version < "4.0"
 pydot==1.4.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.4.0"
@@ -147,6 +156,7 @@ python3-openid==3.2.0; python_version >= "3.0"
 pytz==2021.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6"
 pyuwsgi==2.0.19.1.post0
 pyyaml==5.4.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
+pyzmq==22.0.3; python_version >= "3.6"
 rdflib-jsonld==0.5.0; python_version >= "3.6" and python_version < "4"
 rdflib==4.2.2; python_version >= "3.6" and python_version < "4"
 refgenconf==0.9.3
@@ -160,8 +170,8 @@ routes==2.5.1
 rsa==4.7.2; python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6")
 ruamel.yaml.clib==0.2.2; platform_python_implementation == "CPython" and python_version < "3.8" and python_version >= "3.6"
 ruamel.yaml==0.16.5; python_version >= "3.6" and python_version < "4"
-s3transfer==0.3.4
-schema-salad==7.1.20210309094900; python_version >= "3.6" and python_version < "4"
+s3transfer==0.3.6
+schema-salad==7.1.20210316164414; python_version >= "3.6" and python_version < "4"
 setuptools-scm==5.0.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
 shellescape==3.4.1; python_version >= "3.6" and python_version < "4"
 simplejson==3.17.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6"
@@ -169,8 +179,7 @@ six==1.15.0; python_version >= "3.6" and python_full_version < "3.0.0" and pytho
 social-auth-core==3.3.0
 sortedcontainers==2.3.0
 sqlalchemy-migrate==0.13.0
-sqlalchemy-utils==0.36.7
-sqlalchemy==1.3.23; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
+sqlalchemy==1.3.24; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 sqlitedict==1.7.0
 sqlparse==0.4.1; python_version >= "3.5"
 starlette-context==0.3.1; python_version >= "3.7"
@@ -180,6 +189,7 @@ svgwrite==1.4.1; python_version >= "3.6"
 tempita==0.5.2
 tenacity==7.0.0
 tifffile==2020.9.3
+tornado==6.1; python_version >= "3.5"
 tqdm==4.59.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 typing-extensions==3.7.4.3; python_version >= "3.6" and python_version < "3.8"
 tzlocal==2.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
@@ -194,6 +204,6 @@ webencodings==0.5.1; python_version >= "2.7" and python_full_version < "3.0.0" o
 webob==1.8.7; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 whoosh==2.7.4
 wrapt==1.12.1; python_version >= "3.6"
-yacman==0.8.0
+yacman==0.8.1
 zipp==3.4.1; python_version < "3.7" and python_version >= "3.6"
 zipstream-new==1.1.8
diff --git a/lib/galaxy/files/__init__.py b/lib/galaxy/files/__init__.py
index e63fb682cbd..15259ef831d 100644
--- a/lib/galaxy/files/__init__.py
+++ b/lib/galaxy/files/__init__.py
@@ -243,6 +243,23 @@ class ProvidesUserFileSourcesUserContext:
         user = self.trans.user
         return user and user.extra_preferences or defaultdict(lambda: None)
 
+    @property
+    def role_names(self):
+        """The set of role names of this user."""
+        user = self.trans.user
+        return user and set([ura.role.name for ura in user.roles])
+
+    @property
+    def group_names(self):
+        """The set of group names to which this user belongs."""
+        user = self.trans.user
+        return user and set([ugr.group.name for ugr in user.groups])
+
+    @property
+    def is_admin(self):
+        """Whether this user is an administrator."""
+        return self.trans.user_is_admin
+
 
 class DictFileSourcesUserContext:
 
@@ -264,3 +281,15 @@ class DictFileSourcesUserContext:
     @property
     def preferences(self):
         return self._kwd.get("preferences")
+
+    @property
+    def role_names(self):
+        return self._kwd.get("role_names")
+
+    @property
+    def group_names(self):
+        return self._kwd.get("group_names")
+
+    @property
+    def is_admin(self):
+        return self._kwd.get("is_admin")
diff --git a/lib/galaxy/files/_schema.py b/lib/galaxy/files/_schema.py
index 3c49d2fa096..def79b125a5 100644
--- a/lib/galaxy/files/_schema.py
+++ b/lib/galaxy/files/_schema.py
@@ -1,5 +1,8 @@
 from enum import Enum
-from typing import List
+from typing import (
+    List,
+    Optional,
+)
 
 from pydantic import (
     BaseModel,
@@ -62,6 +65,16 @@ class FilesSourcePlugin(BaseModel):
         description="Whether this files source plugin allows write access.",
         example=False,
     )
+    requires_roles: Optional[str] = Field(
+        None,
+        title="Requires roles",
+        description="Only users with the roles specified here can access this files source.",
+    )
+    requires_groups: Optional[str] = Field(
+        None,
+        title="Requires groups",
+        description="Only users belonging to the groups specified here can access this files source.",
+    )
 
     class Config:
         # This allows additional fields (that are not validated)
diff --git a/lib/galaxy/files/sources/__init__.py b/lib/galaxy/files/sources/__init__.py
index 83181a3c2b8..455339e1043 100644
--- a/lib/galaxy/files/sources/__init__.py
+++ b/lib/galaxy/files/sources/__init__.py
@@ -1,7 +1,16 @@
 import abc
 import os
 import time
+from typing import Set
 
+from galaxy.exceptions import (
+    ConfigurationError,
+    ItemAccessibilityException,
+)
+from galaxy.util.bool_expressions import (
+    BooleanExpressionEvaluator,
+    TokenContainedEvaluator,
+)
 from galaxy.util.template import fill_template
 
 DEFAULT_SCHEME = "gxfiles"
@@ -24,6 +33,10 @@ class FilesSource(metaclass=abc.ABCMeta):
     def get_writable(self):
         """Return a boolean indicating if this target is writable."""
 
+    @abc.abstractmethod
+    def user_has_access(self, user_context) -> bool:
+        """Return a boolean indicating if the user can access the FileSource."""
+
     # TODO: off-by-default
     @abc.abstractmethod
     def list(self, source_path="/", recursive=False, user_context=None):
@@ -57,6 +70,16 @@ class BaseFilesSource(FilesSource):
     def get_writable(self):
         return self.writable
 
+    def user_has_access(self, user_context) -> bool:
+        return (
+            user_context is None
+            or user_context.is_admin
+            or (
+                self._user_has_required_roles(user_context)
+                and self._user_has_required_groups(user_context)
+            )
+        )
+
     def get_uri_root(self):
         prefix = self.get_prefix()
         scheme = self.get_scheme()
@@ -69,13 +92,16 @@ class BaseFilesSource(FilesSource):
         uri_root = self.get_uri_root()
         return uri_join(uri_root, path)
 
-    def _parse_common_config_opts(self, kwd):
+    def _parse_common_config_opts(self, kwd: dict):
         self._file_sources_config = kwd.pop("file_sources_config")
         self.id = kwd.pop("id")
         self.label = kwd.pop("label", None) or self.id
         self.doc = kwd.pop("doc", None)
         self.scheme = kwd.pop("scheme", DEFAULT_SCHEME)
         self.writable = kwd.pop("writable", DEFAULT_WRITABLE)
+        self.requires_roles = kwd.pop("requires_roles", None)
+        self.requires_groups = kwd.pop("requires_groups", None)
+        self._validate_security_rules()
         # If coming from to_dict, strip API helper values
         kwd.pop("uri_root", None)
         kwd.pop("type", None)
@@ -89,6 +115,8 @@ class BaseFilesSource(FilesSource):
             "label": self.label,
             "doc": self.doc,
             "writable": self.writable,
+            "requires_roles": self.requires_roles,
+            "requires_groups": self.requires_groups,
         }
         if for_serialization:
             rval.update(self._serialization_props(user_context=user_context))
@@ -109,15 +137,37 @@ class BaseFilesSource(FilesSource):
         Used in to_dict method if for_serialization is True.
         """
 
+    def list(self, path="/", recursive=False, user_context=None):
+        self._check_user_access(user_context)
+        return self._list(path, recursive, user_context)
+
+    @abc.abstractmethod
+    def _list(self, path="/", recursive=False, user_context=None):
+        pass
+
     def write_from(self, target_path, native_path, user_context=None):
         if not self.get_writable():
             raise Exception("Cannot write to a non-writable file source.")
+        self._check_user_access(user_context)
         self._write_from(target_path, native_path, user_context=user_context)
 
     @abc.abstractmethod
     def _write_from(self, target_path, native_path, user_context=None):
         pass
 
+    def realize_to(self, source_path, native_path, user_context=None):
+        self._check_user_access(user_context)
+        self._realize_to(source_path, native_path, user_context)
+
+    @abc.abstractmethod
+    def _realize_to(self, source_path, native_path, user_context=None):
+        pass
+
+    def _check_user_access(self, user_context):
+        """Raises an exception if the given user doesn't have the rights to access this file source."""
+        if user_context is not None and not self.user_has_access(user_context):
+            raise ItemAccessibilityException(f"User {user_context.username} has no access to file source.")
+
     def _evaluate_prop(self, prop_val, user_context):
         rval = prop_val
         if isinstance(prop_val, str) and "$" in prop_val:
@@ -130,6 +180,33 @@ class BaseFilesSource(FilesSource):
 
         return rval
 
+    def _user_has_required_roles(self, user_context) -> bool:
+        if self.requires_roles:
+            return self._evaluate_security_rules(self.requires_roles, user_context.role_names)
+        return True
+
+    def _user_has_required_groups(self, user_context) -> bool:
+        if self.requires_groups:
+            return self._evaluate_security_rules(self.requires_groups, user_context.group_names)
+        return True
+
+    def _evaluate_security_rules(self, rule_expression: str, user_credentials: Set[str]) -> bool:
+        token_evaluator = TokenContainedEvaluator(user_credentials)
+        evaluator = BooleanExpressionEvaluator(token_evaluator)
+        return evaluator.evaluate_expression(rule_expression)
+
+    def _validate_security_rules(self) -> None:
+        """Checks if the security rules defined in the plugin configuration are valid boolean expressions or raises
+        a ConfigurationError exception otherwise."""
+
+        def _get_error_msg_for(rule_name: str) -> str:
+            return f"Invalid boolean expression for '{rule_name}' in {self.label} file source plugin configuration."
+
+        if self.requires_roles and not BooleanExpressionEvaluator.is_valid_expression(self.requires_roles):
+            raise ConfigurationError(_get_error_msg_for("requires_roles"))
+        if self.requires_groups and not BooleanExpressionEvaluator.is_valid_expression(self.requires_groups):
+            raise ConfigurationError(_get_error_msg_for("requires_groups"))
+
 
 def uri_join(*args):
     # url_join doesn't work with non-standard scheme
diff --git a/lib/galaxy/files/sources/_pyfilesystem2.py b/lib/galaxy/files/sources/_pyfilesystem2.py
index eff267e0653..fbf5f9e84a5 100644
--- a/lib/galaxy/files/sources/_pyfilesystem2.py
+++ b/lib/galaxy/files/sources/_pyfilesystem2.py
@@ -22,7 +22,7 @@ class PyFilesystem2FilesSource(BaseFilesSource):
     def _open_fs(self, user_context=None):
         """Subclasses must instantiate a PyFilesystem2 handle for this file system."""
 
-    def list(self, path="/", recursive=False, user_context=None):
+    def _list(self, path="/", recursive=False, user_context=None):
         """Return dictionary of 'Directory's and 'File's."""
 
         with self._open_fs(user_context=user_context) as h:
@@ -38,7 +38,7 @@ class PyFilesystem2FilesSource(BaseFilesSource):
                 to_dict = functools.partial(self._resource_info_to_dict, path)
                 return list(map(to_dict, res))
 
-    def realize_to(self, source_path, native_path, user_context=None):
+    def _realize_to(self, source_path, native_path, user_context=None):
         with open(native_path, 'wb') as write_file:
             self._open_fs(user_context=user_context).download(source_path, write_file)
 
diff --git a/lib/galaxy/files/sources/posix.py b/lib/galaxy/files/sources/posix.py
index 5c9140bf916..df83b13bbc0 100644
--- a/lib/galaxy/files/sources/posix.py
+++ b/lib/galaxy/files/sources/posix.py
@@ -30,7 +30,7 @@ class PosixFilesSource(BaseFilesSource):
         self.enforce_symlink_security = props.get("enforce_symlink_security", DEFAULT_ENFORCE_SYMLINK_SECURITY)
         self.delete_on_realize = props.get("delete_on_realize", DEFAULT_DELETE_ON_REALIZE)
 
-    def list(self, path="/", recursive=True, user_context=None):
+    def _list(self, path="/", recursive=True, user_context=None):
         dir_path = self._to_native_path(path, user_context=user_context)
         if not self._safe_directory(dir_path):
             raise exceptions.ObjectNotFound('The specified directory does not exist [%s].' % dir_path)
@@ -47,7 +47,7 @@ class PosixFilesSource(BaseFilesSource):
             to_dict = functools.partial(self._resource_info_to_dict, path, user_context=user_context)
             return list(map(to_dict, res))
 
-    def realize_to(self, source_path, native_path, user_context=None):
+    def _realize_to(self, source_path, native_path, user_context=None):
         effective_root = self._effective_root(user_context)
         source_native_path = self._to_native_path(source_path, user_context=user_context)
         if self.enforce_symlink_security:
diff --git a/lib/galaxy/files/sources/s3fs.py b/lib/galaxy/files/sources/s3fs.py
index 3e5fa4924ef..876db6d7b05 100644
--- a/lib/galaxy/files/sources/s3fs.py
+++ b/lib/galaxy/files/sources/s3fs.py
@@ -1,4 +1,5 @@
 import functools
+import logging
 import os
 
 try:
@@ -11,6 +12,8 @@ from ..sources import BaseFilesSource
 DEFAULT_ENFORCE_SYMLINK_SECURITY = True
 DEFAULT_DELETE_ON_REALIZE = False
 
+log = logging.getLogger(__name__)
+
 
 class S3FsFilesSource(BaseFilesSource):
     plugin_type = 's3fs'
@@ -19,11 +22,12 @@ class S3FsFilesSource(BaseFilesSource):
         if s3fs is None:
             raise Exception("Package s3fs unavailable but required for this file source plugin.")
         props = self._parse_common_config_opts(kwd)
-        self._bucket = props.pop("bucket")
-        assert self._bucket
+        self._bucket = props.pop("bucket", '')
+        self._endpoint_url = props.pop('endpoint_url', None)
+        assert self._endpoint_url or self._bucket
         self._props = props
 
-    def list(self, path="/", recursive=True, user_context=None):
+    def _list(self, path="/", recursive=True, user_context=None):
         fs = self._open_fs(user_context=user_context)
         if recursive:
             res = []
@@ -39,7 +43,7 @@ class S3FsFilesSource(BaseFilesSource):
             to_dict = functools.partial(self._resource_info_to_dict, path)
             return list(map(to_dict, res))
 
-    def realize_to(self, source_path, native_path, user_context=None):
+    def _realize_to(self, source_path, native_path, user_context=None):
         bucket_path = self._bucket_path(source_path)
         self._open_fs(user_context=user_context).download(bucket_path, native_path)
 
@@ -52,6 +56,8 @@ class S3FsFilesSource(BaseFilesSource):
         return f"{self._bucket}{path}"
 
     def _open_fs(self, user_context=None):
+        if self._endpoint_url:
+            self._props.update({'client_kwargs': {'endpoint_url': self._endpoint_url}})
         fs = s3fs.S3FileSystem(**self._props)
         return fs
 
diff --git a/lib/galaxy/job_execution/output_collect.py b/lib/galaxy/job_execution/output_collect.py
index c4386128d64..979636562ab 100644
--- a/lib/galaxy/job_execution/output_collect.py
+++ b/lib/galaxy/job_execution/output_collect.py
@@ -177,10 +177,24 @@ class BaseJobContext:
             filenames[discovered_file.path] = discovered_file
         return filenames
 
+    def get_job_id(self):
+        return None  # overwritten in subclasses
+
 
 class JobContext(ModelPersistenceContext, BaseJobContext):
 
-    def __init__(self, tool, tool_provided_metadata, job, job_working_directory, permission_provider, metadata_source_provider, input_dbkey, object_store, final_job_state):
+    def __init__(
+            self,
+            tool,
+            tool_provided_metadata,
+            job,
+            job_working_directory,
+            permission_provider,
+            metadata_source_provider,
+            input_dbkey,
+            object_store,
+            final_job_state,
+            flush_per_n_datasets=None):
         self.tool = tool
         self.metadata_source_provider = metadata_source_provider
         self.permission_provider = permission_provider
@@ -192,6 +206,7 @@ class JobContext(ModelPersistenceContext, BaseJobContext):
         self.tool_provided_metadata = tool_provided_metadata
         self.object_store = object_store
         self.final_job_state = final_job_state
+        self.flush_per_n_datasets = flush_per_n_datasets
 
     @property
     def work_context(self):
@@ -299,6 +314,9 @@ class JobContext(ModelPersistenceContext, BaseJobContext):
     def job_id(self):
         return self.job.id
 
+    def get_job_id(self):
+        return self.job.id
+
 
 class SessionlessJobContext(SessionlessModelPersistenceContext, BaseJobContext):
 
@@ -312,6 +330,7 @@ class SessionlessJobContext(SessionlessModelPersistenceContext, BaseJobContext):
         self.import_store = import_store
         self.input_dbkey = input_dbkey
         self.final_job_state = final_job_state
+        self.flush_per_n_datasets = None
 
     def output_collection_def(self, name):
         tool_as_dict = self.metadata_params["tool"]
@@ -355,8 +374,10 @@ class SessionlessJobContext(SessionlessModelPersistenceContext, BaseJobContext):
             self.export_store.collection_datasets[collection_dataset.id] = True
 
     def add_output_dataset_association(self, name, dataset_instance):
-        job_id = self.metadata_params["job_id_tag"]
-        self.export_store.add_job_output_dataset_associations(job_id, name, dataset_instance)
+        self.export_store.add_job_output_dataset_associations(self.get_job_id(), name, dataset_instance)
+
+    def get_job_id(self):
+        return self.metadata_params["job_id_tag"]
 
 
 def collect_primary_datasets(job_context, output, input_ext):
@@ -419,6 +440,7 @@ def collect_primary_datasets(job_context, output, input_ext):
                 info=info,
                 init_from=outdata,
                 dataset_attributes=new_primary_datasets_attributes,
+                creating_job_id=job_context.get_job_id() if job_context else None
             )
             # Associate new dataset with job
             job_context.add_output_dataset_association(f'__new_primary_file_{name}|{designation}__', primary_data)
@@ -478,10 +500,11 @@ def walk_over_extra_files(target_dir, extra_file_collector, job_working_director
     if os.path.isdir(directory):
         for filename in os.listdir(directory):
             path = os.path.join(directory, filename)
-            if os.path.isdir(path) and extra_file_collector.recurse:
-                # The current directory is already validated, so use that as the next job_working_directory when recursing
-                for match in walk_over_extra_files(filename, extra_file_collector, directory, matchable):
-                    yield match
+            if os.path.isdir(path):
+                if extra_file_collector.recurse:
+                    # The current directory is already validated, so use that as the next job_working_directory when recursing
+                    for match in walk_over_extra_files(filename, extra_file_collector, directory, matchable):
+                        yield match
             else:
                 match = extra_file_collector.match(matchable, filename, path=path)
                 if match:
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index d9877bdaa94..2ef3f7a3f63 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -57,7 +57,7 @@ from galaxy.jobs.runners import BaseJobRunner, JobState
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.model import store
 from galaxy.objectstore import ObjectStorePopulator
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.tool_util.deps import requirements
 from galaxy.tool_util.output_checker import (
     check_output,
@@ -301,7 +301,7 @@ class JobConfiguration(ConfiguresHandlers):
         <when value="yes"/>
     </conditional>"""
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         """Parse the job configuration XML.
         """
         self.app = app
@@ -1348,7 +1348,10 @@ class JobWrapper(HasResourceParameters):
             ActionBox.execute(self.app, self.sa_session, pja, job)
         # If the job was deleted, call tool specific fail actions (used for e.g. external metadata) and clean up
         if self.tool:
-            self.tool.job_failed(self, message, exception)
+            try:
+                self.tool.job_failed(self, message, exception)
+            except Exception:
+                log.exception(f"Error occured while calling tool specific fail actions for job {job.id}")
         cleanup_job = self.cleanup_job
         delete_files = cleanup_job == 'always' or (cleanup_job == 'onsuccess' and job.state == job.states.DELETED)
         self.cleanup(delete_files=delete_files)
diff --git a/lib/galaxy/jobs/manager.py b/lib/galaxy/jobs/manager.py
index a9740288e75..fab77182b5d 100644
--- a/lib/galaxy/jobs/manager.py
+++ b/lib/galaxy/jobs/manager.py
@@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import null
 from galaxy.exceptions import HandlerAssignmentError, ToolExecutionError
 from galaxy.jobs import handler, NoopQueue
 from galaxy.model import Job
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.web_stack.message import JobHandlerMessage
 
 log = logging.getLogger(__name__)
@@ -21,7 +21,7 @@ class JobManager:
     """
     job_handler: handler.JobHandlerI
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
         self.job_lock = False
         if self.app.is_job_handler:
diff --git a/lib/galaxy/jobs/runners/__init__.py b/lib/galaxy/jobs/runners/__init__.py
index 79d0f2ecd4c..80656afb6fe 100644
--- a/lib/galaxy/jobs/runners/__init__.py
+++ b/lib/galaxy/jobs/runners/__init__.py
@@ -141,7 +141,9 @@ class BaseJobRunner:
                     job_state = JobState(job_wrapper=arg, job_destination={})
                 else:
                     job_state = arg
-                self.work_queue.put((self.fail_job, job_state))
+                if method != self.fail_job:
+                    # Prevent fail_job cycle in the work_queue
+                    self.work_queue.put((self.fail_job, job_state))
 
     # Causes a runner's `queue_job` method to be called from a worker thread
     def put(self, job_wrapper):
diff --git a/lib/galaxy/jobs/runners/kubernetes.py b/lib/galaxy/jobs/runners/kubernetes.py
index 5411d5a5f1e..ad2668cc9f6 100644
--- a/lib/galaxy/jobs/runners/kubernetes.py
+++ b/lib/galaxy/jobs/runners/kubernetes.py
@@ -6,6 +6,7 @@ import logging
 import math
 import os
 import re
+from datetime import datetime
 
 import yaml
 
@@ -21,6 +22,7 @@ from galaxy.jobs.runners.util.pykube_util import (
     find_job_object_by_name,
     find_pod_object_by_name,
     galaxy_instance_id,
+    is_pod_unschedulable,
     Job,
     job_object_dict,
     Pod,
@@ -70,7 +72,8 @@ class KubernetesJobRunner(AsynchronousJobRunner):
             k8s_fs_group_id=dict(map=int),
             k8s_cleanup_job=dict(map=str, valid=lambda s: s in {"onsuccess", "always", "never"}, default="always"),
             k8s_pod_retries=dict(map=int, valid=lambda x: int(x) >= 0, default=3),
-            k8s_walltime_limit=dict(map=int, valid=lambda x: int(x) >= 0, default=172800))
+            k8s_walltime_limit=dict(map=int, valid=lambda x: int(x) >= 0, default=172800),
+            k8s_unschedulable_walltime_limit=dict(map=int, valid=lambda x: int(x) >= 0, default=1800),)
 
         if 'runner_param_specs' not in kwargs:
             kwargs['runner_param_specs'] = dict()
@@ -484,8 +487,15 @@ class KubernetesJobRunner(AsynchronousJobRunner):
                 return None
             elif active > 0 and failed <= max_pod_retries:
                 if not job_state.running:
-                    job_state.running = True
-                    job_state.job_wrapper.change_state(model.Job.states.RUNNING)
+                    if self.__job_pending_due_to_unschedulable_pod(job_state):
+                        creation_time_str = job.obj['metadata'].get('creationTimestamp')
+                        creation_time = datetime.strptime(creation_time_str, '%Y-%m-%dT%H:%M:%SZ')
+                        elapsed_seconds = (datetime.utcnow() - creation_time).total_seconds()
+                        if elapsed_seconds > self.runner_params['k8s_unschedulable_walltime_limit']:
+                            return self._handle_unschedulable_job(job, job_state)
+                    else:
+                        job_state.running = True
+                        job_state.job_wrapper.change_state(model.Job.states.RUNNING)
                 return job_state
             elif job_persisted_state == model.Job.states.DELETED:
                 # Job has been deleted via stop_job and job has not been deleted,
@@ -515,6 +525,18 @@ class KubernetesJobRunner(AsynchronousJobRunner):
             # job is no longer viable - remove from watched jobs
             return None
 
+    def _handle_unschedulable_job(self, job, job_state):
+        # Handle unschedulable job that exceeded deadline
+        job_state.fail_message = "Job was unschedulable longer than specified deadline"
+        job_state.runner_state = JobState.runner_states.WALLTIME_REACHED
+        job_state.running = False
+        self.mark_as_failed(job_state)
+        try:
+            self.__cleanup_k8s_job(job)
+        except Exception:
+            log.exception("Could not clean up k8s batch job. Ignoring...")
+        return None
+
     def _handle_job_failure(self, job, job_state):
         # Figure out why job has failed
         with open(job_state.error_file, 'a') as error_file:
@@ -563,6 +585,17 @@ class KubernetesJobRunner(AsynchronousJobRunner):
 
         return False
 
+    def __job_pending_due_to_unschedulable_pod(self, job_state):
+        """
+        checks the state of the pod to see if it is unschedulable.
+        """
+        pods = find_pod_object_by_name(self._pykube_api, job_state.job_id, self.runner_params['k8s_namespace'])
+        if not pods.response['items']:
+            return False
+
+        pod = Pod(self._pykube_api, pods.response['items'][0])
+        return is_pod_unschedulable(self._pykube_api, pod, self.runner_params['k8s_namespace'])
+
     def stop_job(self, job_wrapper):
         """Attempts to delete a dispatched job to the k8s cluster"""
         job = job_wrapper.get_job()
diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py
index d60c1fc9748..b1bb1b65568 100644
--- a/lib/galaxy/jobs/runners/pulsar.py
+++ b/lib/galaxy/jobs/runners/pulsar.py
@@ -305,7 +305,7 @@ class PulsarJobRunner(AsynchronousJobRunner):
 
     def _update_job_state_for_status(self, job_state, pulsar_status, full_status=None):
         log.debug('(%s) Received status update: %s %s', job_state.job_id, type(pulsar_status), pulsar_status)
-        if pulsar_status == "complete" or job_state.job_wrapper.get_state() == model.Job.states.STOPPED:
+        if pulsar_status in ["complete", "cancelled"] or job_state.job_wrapper.get_state() == model.Job.states.STOPPED:
             self.mark_as_finished(job_state)
             return None
         if pulsar_status in ["failed", "lost"]:
@@ -382,6 +382,7 @@ class PulsarJobRunner(AsynchronousJobRunner):
             if os.path.exists(tool_script):
                 log.debug("Registering tool_script for Pulsar transfer [%s]" % tool_script)
                 job_directory_files.append(tool_script)
+                config_files.append(tool_script)
             # Following is job destination environment variables
             env = client.env
             # extend it with tool defined environment variables
diff --git a/lib/galaxy/jobs/runners/state_handlers/resubmit.py b/lib/galaxy/jobs/runners/state_handlers/resubmit.py
index 4899466ce6e..afa51baedaf 100644
--- a/lib/galaxy/jobs/runners/state_handlers/resubmit.py
+++ b/lib/galaxy/jobs/runners/state_handlers/resubmit.py
@@ -187,7 +187,7 @@ class _ExpressionContext:
             self._lazy_context = {
                 "walltime_reached": runner_state == JobState.runner_states.WALLTIME_REACHED,
                 "memory_limit_reached": runner_state == JobState.runner_states.MEMORY_LIMIT_REACHED,
-                "unknown_error": JobState.runner_states.UNKNOWN_ERROR,
+                "unknown_error": runner_state == JobState.runner_states.UNKNOWN_ERROR,
                 "tool_detected_failure": runner_state == JobState.runner_states.TOOL_DETECT_ERROR,
                 "any_failure": True,
                 "any_potential_job_failure": True,  # Add a hook here - later on allow tools to describe things that are definitely input problems.
diff --git a/lib/galaxy/jobs/runners/util/pykube_util.py b/lib/galaxy/jobs/runners/util/pykube_util.py
index bee2ae3920a..9b7a1acbfe5 100644
--- a/lib/galaxy/jobs/runners/util/pykube_util.py
+++ b/lib/galaxy/jobs/runners/util/pykube_util.py
@@ -68,6 +68,14 @@ def find_pod_object_by_name(pykube_api, job_name, namespace=None):
     return Pod.objects(pykube_api).filter(selector="job-name=" + job_name, namespace=namespace)
 
 
+def is_pod_unschedulable(pykube_api, pod, namespace=None):
+    is_unschedulable = bool(len([c for c in pod.obj['status']['conditions'] if c.get("reason") == "Unschedulable"]))
+    if pod.obj['status']['phase'] == "Pending" and is_unschedulable:
+        return True
+
+    return False
+
+
 def stop_job(job, cleanup="always"):
     job_failed = (job.obj['status']['failed'] > 0
                   if 'failed' in job.obj['status'] else False)
@@ -126,6 +134,7 @@ __all__ = (
     "find_job_object_by_name",
     "find_pod_object_by_name",
     "galaxy_instance_id",
+    "is_pod_unschedulable",
     "Job",
     "job_object_dict",
     "Pod",
diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
index de18f4c279c..bac9e9198ab 100644
--- a/lib/galaxy/managers/base.py
+++ b/lib/galaxy/managers/base.py
@@ -37,7 +37,7 @@ from sqlalchemy.orm.scoping import scoped_session
 from galaxy import exceptions
 from galaxy import model
 from galaxy.model import tool_shed_install
-from galaxy.structured_app import BasicApp, StructuredApp
+from galaxy.structured_app import BasicApp, MinimalManagerApp
 from galaxy.util import namedtuple
 
 log = logging.getLogger(__name__)
@@ -488,7 +488,7 @@ class HasAModelManager:
     # examples where this doesn't really work are ConfigurationSerializer (no manager)
     # and contents (2 managers)
 
-    def __init__(self, app: StructuredApp, manager=None, **kwargs):
+    def __init__(self, app: MinimalManagerApp, manager=None, **kwargs):
         self._manager = manager
 
     @property
@@ -542,7 +542,7 @@ class ModelSerializer(HasAModelManager):
     default_view: Optional[str]
     views: Dict[str, List[str]]
 
-    def __init__(self, app: StructuredApp, **kwargs):
+    def __init__(self, app: MinimalManagerApp, **kwargs):
         """
         Set up serializer map, any additional serializable keys, and views here.
         """
@@ -713,7 +713,7 @@ class ModelDeserializer(HasAModelManager):
     """
     # TODO:?? a larger question is: which should be first? Deserialize then validate - or - validate then deserialize?
 
-    def __init__(self, app: StructuredApp, validator=None, **kwargs):
+    def __init__(self, app: MinimalManagerApp, validator=None, **kwargs):
         """
         Set up deserializers and validator.
         """
@@ -904,7 +904,7 @@ class ModelFilterParser(HasAModelManager):
     orm_filter_parsers: Dict[str, Dict]
     fn_filter_parsers: Dict[str, Dict]
 
-    def __init__(self, app: StructuredApp, **kwargs):
+    def __init__(self, app: MinimalManagerApp, **kwargs):
         """
         Set up serializer map, any additional serializable keys, and views here.
         """
diff --git a/lib/galaxy/managers/collections.py b/lib/galaxy/managers/collections.py
index c45942401e9..e3e62d33fef 100644
--- a/lib/galaxy/managers/collections.py
+++ b/lib/galaxy/managers/collections.py
@@ -254,18 +254,6 @@ class DatasetCollectionManager:
         for _, tag in tags.items():
             dataset_collection_instance.tags.append(tag.copy(cls=model.HistoryDatasetCollectionTagAssociation))
 
-    def set_collection_elements(self, dataset_collection, dataset_instances):
-        if dataset_collection.populated:
-            raise Exception("Cannot reset elements of an already populated dataset collection.")
-
-        collection_type = dataset_collection.collection_type
-        collection_type_description = self.collection_type_descriptions.for_collection_type(collection_type)
-        type_plugin = collection_type_description.rank_type_plugin()
-        builder.set_collection_elements(dataset_collection, type_plugin, dataset_instances)
-        dataset_collection.mark_as_populated()
-
-        return dataset_collection
-
     def collection_builder_for(self, dataset_collection):
         return builder.BoundCollectionBuilder(dataset_collection)
 
@@ -299,7 +287,7 @@ class DatasetCollectionManager:
         changed = self._set_from_dict(trans, dataset_collection_instance, payload)
         return changed
 
-    def copy(self, trans, parent, source, encoded_source_id, copy_elements=False):
+    def copy(self, trans, parent, source, encoded_source_id, copy_elements=False, dataset_instance_attributes=None):
         """
         PRECONDITION: security checks on ability to add to parent occurred
         during load.
@@ -308,7 +296,9 @@ class DatasetCollectionManager:
         source_hdca = self.__get_history_collection_instance(trans, encoded_source_id)
         copy_kwds = {}
         if copy_elements:
-            copy_kwds["element_destination"] = parent
+            copy_kwds["element_destination"] = parent  # e.g. a history
+        if dataset_instance_attributes is not None:
+            copy_kwds["dataset_instance_attributes"] = dataset_instance_attributes
         new_hdca = source_hdca.copy(**copy_kwds)
         new_hdca.copy_tags_from(target_user=trans.get_user(), source=source_hdca)
         if not copy_elements:
diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
index 4fe42582691..cbf2bd1be09 100644
--- a/lib/galaxy/managers/configuration.py
+++ b/lib/galaxy/managers/configuration.py
@@ -15,7 +15,7 @@ from typing import (
     List,
 )
 
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 from galaxy.managers import base
 from galaxy.managers.context import ProvidesUserContext
 from galaxy.schema.fields import EncodedDatabaseIdField
@@ -30,7 +30,7 @@ VERSION_JSON_FILE = 'version.json'
 class ConfigurationManager:
     """Interface/service object for interacting with configuration and related data."""
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self._app = app
 
     def get_configuration(
@@ -122,6 +122,9 @@ class ConfigSerializer(base.ModelSerializer):
             assert hasattr(config, key)
             return getattr(config, key)
 
+        def _config_is_truthy(config, key, **context):
+            return True if config.get(key) else False
+
         self.serializers = {
             # TODO: this is available from user data, remove
             'is_admin_user': lambda *a, **c: False,
@@ -151,6 +154,7 @@ class ConfigSerializer(base.ModelSerializer):
             'allow_user_impersonation': _use_config,
             'allow_user_creation': _defaults_to(False),  # schema default is True
             'use_remote_user': _defaults_to(None),  # schema default is False; or config.single_user
+            'single_user': _config_is_truthy,
             'enable_oidc': _use_config,
             'oidc': _use_config,
             'enable_quotas': _use_config,
@@ -160,7 +164,6 @@ class ConfigSerializer(base.ModelSerializer):
             'ga_code': _use_config,
             'enable_unique_workflow_defaults': _use_config,
             'enable_beta_markdown_export': _use_config,
-            'simplified_workflow_run_ui': _use_config,
             'simplified_workflow_run_ui_target_history': _use_config,
             'simplified_workflow_run_ui_job_cache': _use_config,
             'has_user_tool_filters': _defaults_to(False),
diff --git a/lib/galaxy/managers/context.py b/lib/galaxy/managers/context.py
index 4b9069a6f85..cbdf15cbfb5 100644
--- a/lib/galaxy/managers/context.py
+++ b/lib/galaxy/managers/context.py
@@ -50,7 +50,7 @@ from galaxy.model import (
 )
 from galaxy.model.base import ModelMapping
 from galaxy.security.idencoding import IdEncodingHelper
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.util import bunch
 
 
@@ -62,7 +62,7 @@ class ProvidesAppContext:
     """
 
     @abc.abstractproperty
-    def app(self) -> StructuredApp:
+    def app(self) -> MinimalManagerApp:
         """Provide access to the Galaxy ``app`` object.
         """
 
diff --git a/lib/galaxy/managers/datasets.py b/lib/galaxy/managers/datasets.py
index 0f7092e3a5e..483e13004fc 100644
--- a/lib/galaxy/managers/datasets.py
+++ b/lib/galaxy/managers/datasets.py
@@ -18,7 +18,7 @@ from galaxy.managers import (
     secured,
     users
 )
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.util.checkers import check_binary
 
 log = logging.getLogger(__name__)
@@ -33,7 +33,7 @@ class DatasetManager(base.ModelManager, secured.AccessibleManagerMixin, deletabl
 
     # TODO:?? get + error_if_uploading is common pattern, should upload check be worked into access/owed?
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.permissions = DatasetRBACPermissions(app)
         # needed for admin test
@@ -143,7 +143,7 @@ class DatasetRBACPermissions:
 class DatasetSerializer(base.ModelSerializer, deletable.PurgableSerializerMixin):
     model_manager_class = DatasetManager
 
-    def __init__(self, app: StructuredApp, user_manager: users.UserManager):
+    def __init__(self, app: MinimalManagerApp, user_manager: users.UserManager):
         super().__init__(app)
         self.dataset_manager = self.manager
         # needed for admin test
@@ -302,8 +302,10 @@ class DatasetAssociationManager(base.ModelManager,
             if not job.finished:
                 # Are *all* of the job's other output datasets deleted?
                 if job.check_if_output_datasets_deleted():
-                    job.mark_deleted(self.app.config.track_jobs_in_database)
-                    self.app.job_manager.stop(job)
+                    track_jobs_in_database = self.app.config.track_jobs_in_database
+                    job.mark_deleted(track_jobs_in_database)
+                    if not track_jobs_in_database:
+                        self.app.job_manager.stop(job)
                     return True
         return False
 
diff --git a/lib/galaxy/managers/folders.py b/lib/galaxy/managers/folders.py
index cdb1c42f6a1..b88a2979002 100644
--- a/lib/galaxy/managers/folders.py
+++ b/lib/galaxy/managers/folders.py
@@ -8,6 +8,7 @@ from sqlalchemy.orm.exc import (
     NoResultFound
 )
 
+from galaxy import util
 from galaxy.exceptions import (
     AuthenticationRequired,
     InconsistentDatabase,
@@ -15,9 +16,11 @@ from galaxy.exceptions import (
     InternalServerError,
     ItemAccessibilityException,
     MalformedId,
-    RequestParameterInvalidException
+    RequestParameterInvalidException,
+    RequestParameterMissingException,
 )
-from galaxy.util import unicodify
+from galaxy.managers.roles import RoleManager
+from galaxy.structured_app import StructuredApp
 
 log = logging.getLogger(__name__)
 
@@ -51,7 +54,7 @@ class FolderManager:
         except NoResultFound:
             raise RequestParameterInvalidException('No folder found with the id provided.')
         except Exception as e:
-            raise InternalServerError('Error loading from the database.' + unicodify(e))
+            raise InternalServerError('Error loading from the database.' + util.unicodify(e))
         folder = self.secure(trans, folder, check_manageable, check_accessible)
         return folder
 
@@ -309,3 +312,260 @@ class FolderManager:
         :rtype:    int
         """
         return self.decode_folder_id(trans, self.cut_the_prefix(encoded_folder_id))
+
+
+class FoldersService:
+    """Common interface/service logic for interactions with library folders in the context of the API.
+    Provides the logic of the actions invoked by API controllers and uses type definitions
+    and pydantic models to declare its parameters and return types.
+    """
+
+    def __init__(self, app: StructuredApp, folder_manager: FolderManager, role_manager: RoleManager) -> None:
+        self._app = app
+        self.folder_manager = folder_manager
+        self.role_manager = role_manager
+
+    def show(self, trans, id):
+        """
+        Displays information about a folder.
+
+        :param  id:      the folder's encoded id (required)
+        :type   id:      an encoded id string (has to be prefixed by 'F')
+
+        :returns:   dictionary including details of the folder
+        :rtype:     dict
+        """
+        folder_id = self.folder_manager.cut_and_decode(trans, id)
+        folder = self.folder_manager.get(trans, folder_id, check_manageable=False, check_accessible=True)
+        return_dict = self.folder_manager.get_folder_dict(trans, folder)
+        return return_dict
+
+    def create(self, trans, encoded_parent_folder_id, payload: dict):
+        """
+        Create a new folder object underneath the one specified in the parameters.
+
+        :param  encoded_parent_folder_id:      (required) the parent folder's id
+        :type   encoded_parent_folder_id:      an encoded id string (should be prefixed by 'F')
+        :param   payload: dictionary structure containing:
+
+            :param  name:                          (required) the name of the new folder
+            :type   name:                          str
+            :param  description:                   the description of the new folder
+            :type   description:                   str
+
+        :type       dictionary
+        :returns:   information about newly created folder, notably including ID
+        :rtype:     dictionary
+        :raises: RequestParameterMissingException
+        """
+        name = payload.get('name', None)
+        if name is None:
+            raise RequestParameterMissingException("Missing required parameter 'name'.")
+        description = payload.get('description', '')
+        decoded_parent_folder_id = self.folder_manager.cut_and_decode(trans, encoded_parent_folder_id)
+        parent_folder = self.folder_manager.get(trans, decoded_parent_folder_id)
+        new_folder = self.folder_manager.create(trans, parent_folder.id, name, description)
+        return self.folder_manager.get_folder_dict(trans, new_folder)
+
+    def get_permissions(self, trans, encoded_folder_id, scope=None, page=None, page_limit=None, query=None):
+        """
+        Load all permissions for the given folder id and return it.
+
+        :param  encoded_folder_id:     the encoded id of the folder
+        :type   encoded_folder_id:     an encoded id string
+
+        :param  scope:      either 'current' or 'available'
+        :type   scope:      string
+
+        :returns:   dictionary with all applicable permissions' values
+        :rtype:     dictionary
+
+        :raises: InsufficientPermissionsException
+        """
+        current_user_roles = trans.get_current_user_roles()
+        is_admin = trans.user_is_admin
+        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
+        folder = self.folder_manager.get(trans, decoded_folder_id)
+
+        if not (is_admin or trans.app.security_agent.can_manage_library_item(current_user_roles, folder)):
+            raise InsufficientPermissionsException('You do not have proper permission to access permissions of this folder.')
+
+        if scope == 'current' or scope is None:
+            return self.folder_manager.get_current_roles(trans, folder)
+        #  Return roles that are available to select.
+        elif scope == 'available':
+            if page is not None:
+                page = int(page)
+            else:
+                page = 1
+            if page_limit is not None:
+                page_limit = int(page_limit)
+            else:
+                page_limit = 10
+            roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder, query, page, page_limit)
+            return_roles = []
+            for role in roles:
+                role_id = trans.security.encode_id(role.id)
+                return_roles.append(dict(id=role_id, name=role.name, type=role.type))
+            return dict(roles=return_roles, page=page, page_limit=page_limit, total=total_roles)
+        else:
+            raise RequestParameterInvalidException("The value of 'scope' parameter is invalid. Alllowed values: current, available")
+
+    def set_permissions(self, trans, encoded_folder_id, payload: dict):
+        """
+        Set permissions of the given folder to the given role ids.
+
+        :param  encoded_folder_id:      the encoded id of the folder to set the permissions of
+        :type   encoded_folder_id:      an encoded id string
+        :param   payload: dictionary structure containing:
+
+            :param  action:            (required) describes what action should be performed
+            :type   action:            string
+            :param  add_ids[]:         list of Role.id defining roles that should have add item permission on the folder
+            :type   add_ids[]:         string or list
+            :param  manage_ids[]:      list of Role.id defining roles that should have manage permission on the folder
+            :type   manage_ids[]:      string or list
+            :param  modify_ids[]:      list of Role.id defining roles that should have modify permission on the folder
+            :type   modify_ids[]:      string or list
+
+        :type       dictionary
+        :returns:   dict of current roles for all available permission types.
+        :rtype:     dictionary
+        :raises: RequestParameterInvalidException, InsufficientPermissionsException, RequestParameterMissingException
+        """
+
+        is_admin = trans.user_is_admin
+        current_user_roles = trans.get_current_user_roles()
+        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
+        folder = self.folder_manager.get(trans, decoded_folder_id)
+        if not (is_admin or trans.app.security_agent.can_manage_library_item(current_user_roles, folder)):
+            raise InsufficientPermissionsException('You do not have proper permission to modify permissions of this folder.')
+
+        new_add_roles_ids = util.listify(payload.get('add_ids[]', None))
+        new_manage_roles_ids = util.listify(payload.get('manage_ids[]', None))
+        new_modify_roles_ids = util.listify(payload.get('modify_ids[]', None))
+
+        action = payload.get('action', None)
+        if action is None:
+            raise RequestParameterMissingException('The mandatory parameter "action" is missing.')
+        elif action == 'set_permissions':
+
+            # ADD TO LIBRARY ROLES
+            valid_add_roles = []
+            invalid_add_roles_names = []
+            for role_id in new_add_roles_ids:
+                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
+                #  Check whether role is in the set of allowed roles
+                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
+                if role in valid_roles:
+                    valid_add_roles.append(role)
+                else:
+                    invalid_add_roles_names.append(role_id)
+            if len(invalid_add_roles_names) > 0:
+                log.warning("The following roles could not be added to the add library item permission: " + str(invalid_add_roles_names))
+
+            # MANAGE FOLDER ROLES
+            valid_manage_roles = []
+            invalid_manage_roles_names = []
+            for role_id in new_manage_roles_ids:
+                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
+                #  Check whether role is in the set of allowed roles
+                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
+                if role in valid_roles:
+                    valid_manage_roles.append(role)
+                else:
+                    invalid_manage_roles_names.append(role_id)
+            if len(invalid_manage_roles_names) > 0:
+                log.warning("The following roles could not be added to the manage folder permission: " + str(invalid_manage_roles_names))
+
+            # MODIFY FOLDER ROLES
+            valid_modify_roles = []
+            invalid_modify_roles_names = []
+            for role_id in new_modify_roles_ids:
+                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
+                #  Check whether role is in the set of allowed roles
+                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
+                if role in valid_roles:
+                    valid_modify_roles.append(role)
+                else:
+                    invalid_modify_roles_names.append(role_id)
+            if len(invalid_modify_roles_names) > 0:
+                log.warning("The following roles could not be added to the modify folder permission: " + str(invalid_modify_roles_names))
+
+            permissions = {trans.app.security_agent.permitted_actions.LIBRARY_ADD: valid_add_roles}
+            permissions.update({trans.app.security_agent.permitted_actions.LIBRARY_MANAGE: valid_manage_roles})
+            permissions.update({trans.app.security_agent.permitted_actions.LIBRARY_MODIFY: valid_modify_roles})
+
+            trans.app.security_agent.set_all_library_permissions(trans, folder, permissions)
+        else:
+            raise RequestParameterInvalidException('The mandatory parameter "action" has an invalid value.'
+                                                   'Allowed values are: "set_permissions"')
+        return self.folder_manager.get_current_roles(trans, folder)
+
+    def delete(self, trans, encoded_folder_id, undelete: bool = False):
+        """
+        DELETE /api/folders/{encoded_folder_id}
+
+        Mark the folder with the given ``encoded_folder_id`` as `deleted`
+        (or remove the `deleted` mark if the `undelete` param is true).
+
+        .. note:: Currently, only admin users can un/delete folders.
+
+        :param  encoded_folder_id:     the encoded id of the folder to un/delete
+        :type   encoded_folder_id:     an encoded id string
+
+        :param  undelete:    (optional) flag specifying whether the item should be deleted or undeleted, defaults to false:
+        :type   undelete:    bool
+
+        :returns:   detailed folder information
+        :rtype:     dictionary
+
+        """
+        folder = self.folder_manager.get(trans, self.folder_manager.cut_and_decode(trans, encoded_folder_id), True)
+        folder = self.folder_manager.delete(trans, folder, undelete)
+        folder_dict = self.folder_manager.get_folder_dict(trans, folder)
+        return folder_dict
+
+    def update(self, trans, encoded_folder_id, payload: dict):
+        """
+        Update the folder defined by an ``encoded_folder_id``
+        with the data in the payload.
+
+       .. note:: Currently, only admin users can update library folders. Also the folder must not be `deleted`.
+
+        :param  id:      the encoded id of the folder
+        :type   id:      an encoded id string
+
+        :param  payload: (required) dictionary structure containing::
+            'name':         new folder's name, cannot be empty
+            'description':  new folder's description
+        :type   payload: dict
+
+        :returns:   detailed folder information
+        :rtype:     dict
+
+        :raises: RequestParameterMissingException
+        """
+        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
+        folder = self.folder_manager.get(trans, decoded_folder_id)
+        name = payload.get('name', None)
+        if not name:
+            raise RequestParameterMissingException("Parameter 'name' of library folder is required. You cannot remove it.")
+        description = payload.get('description', None)
+        updated_folder = self.folder_manager.update(trans, folder, name, description)
+        folder_dict = self.folder_manager.get_folder_dict(trans, updated_folder)
+        return folder_dict
+
+    def __decode_id(self, trans, encoded_id, object_name=None):
+        """
+        Try to decode the id.
+
+        :param  object_name:      Name of the object the id belongs to. (optional)
+        :type   object_name:      str
+        """
+        try:
+            return trans.security.decode_id(encoded_id)
+        except TypeError:
+            raise MalformedId('Malformed %s id specified, unable to decode.' % object_name if object_name is not None else '')
+        except ValueError:
+            raise MalformedId('Wrong %s id specified, unable to decode.' % object_name if object_name is not None else '')
diff --git a/lib/galaxy/managers/group_roles.py b/lib/galaxy/managers/group_roles.py
index 55ad0475729..a6e488272d0 100644
--- a/lib/galaxy/managers/group_roles.py
+++ b/lib/galaxy/managers/group_roles.py
@@ -7,7 +7,7 @@ from typing import (
 )
 
 from galaxy import model
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 from galaxy.exceptions import (
     ObjectNotFound,
 )
@@ -22,7 +22,7 @@ log = logging.getLogger(__name__)
 class GroupRolesManager:
     """Interface/service object shared by controllers for interacting with group roles."""
 
-    def __init__(self, app: StructuredApp) -> None:
+    def __init__(self, app: MinimalManagerApp) -> None:
         self._app = app
 
     def index(self, trans: ProvidesAppContext, group_id: EncodedDatabaseIdField) -> List[Dict[str, Any]]:
diff --git a/lib/galaxy/managers/group_users.py b/lib/galaxy/managers/group_users.py
index 9dd194311ef..1bbef7ec4a2 100644
--- a/lib/galaxy/managers/group_users.py
+++ b/lib/galaxy/managers/group_users.py
@@ -7,7 +7,7 @@ from typing import (
 )
 
 from galaxy import model
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 from galaxy.exceptions import (
     ObjectNotFound,
 )
@@ -22,7 +22,7 @@ log = logging.getLogger(__name__)
 class GroupUsersManager:
     """Interface/service object shared by controllers for interacting with group users."""
 
-    def __init__(self, app: StructuredApp) -> None:
+    def __init__(self, app: MinimalManagerApp) -> None:
         self._app = app
 
     def index(self, trans: ProvidesAppContext, group_id: EncodedDatabaseIdField) -> List[Dict[str, Any]]:
diff --git a/lib/galaxy/managers/groups.py b/lib/galaxy/managers/groups.py
index 8162bf3ebfe..a35abb4838c 100644
--- a/lib/galaxy/managers/groups.py
+++ b/lib/galaxy/managers/groups.py
@@ -7,7 +7,7 @@ from typing import (
 from sqlalchemy import false
 
 from galaxy import model
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 from galaxy.exceptions import (
     Conflict,
     ObjectAttributeMissingException,
@@ -22,7 +22,7 @@ from galaxy.web import url_for
 class GroupsManager:
     """Interface/service object shared by controllers for interacting with groups."""
 
-    def __init__(self, app: StructuredApp) -> None:
+    def __init__(self, app: MinimalManagerApp) -> None:
         self._app = app
 
     def index(self, trans: ProvidesAppContext):
diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py
index c4d4093a452..dc6c2b2aeba 100644
--- a/lib/galaxy/managers/hdas.py
+++ b/lib/galaxy/managers/hdas.py
@@ -20,7 +20,7 @@ from galaxy.managers import (
     taggable,
     users,
 )
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ class HDAManager(datasets.DatasetAssociationManager,
     # TODO: move what makes sense into DatasetManager
     # TODO: which of these are common with LDDAs and can be pushed down into DatasetAssociationManager?
 
-    def __init__(self, app: StructuredApp, user_manager: users.UserManager):
+    def __init__(self, app: MinimalManagerApp, user_manager: users.UserManager):
         """
         Set up and initialize other managers needed by hdas.
         """
@@ -135,6 +135,13 @@ class HDAManager(datasets.DatasetAssociationManager,
 
     # .... deletion and purging
     def purge(self, hda, flush=True):
+        if self.app.config.enable_celery_tasks:
+            from galaxy.celery.tasks import purge_hda
+            purge_hda.delay(hda_id=hda.id)
+        else:
+            self._purge(hda, flush=flush)
+
+    def _purge(self, hda, flush=True):
         """
         Purge this HDA and the dataset underlying it.
         """
@@ -146,7 +153,6 @@ class HDAManager(datasets.DatasetAssociationManager,
         # decrease the user's space used
         if quota_amount_reduction:
             user.adjust_total_disk_usage(-quota_amount_reduction)
-        return hda
 
     # .... states
     def error_if_uploading(self, hda):
@@ -248,7 +254,7 @@ class HDASerializer(  # datasets._UnflattenedMetadataDatasetAssociationSerialize
         annotatable.AnnotatableSerializerMixin):
     model_manager_class = HDAManager
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.hda_manager = self.manager
 
@@ -507,7 +513,7 @@ class HDADeserializer(datasets.DatasetAssociationDeserializer,
     """
     model_manager_class = HDAManager
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.hda_manager = self.manager
 
diff --git a/lib/galaxy/managers/hdcas.py b/lib/galaxy/managers/hdcas.py
index ac25761b6d0..d810fcc9757 100644
--- a/lib/galaxy/managers/hdcas.py
+++ b/lib/galaxy/managers/hdcas.py
@@ -16,7 +16,7 @@ from galaxy.managers import (
     taggable
 )
 from galaxy.managers.collections_util import get_hda_and_element_identifiers
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.util.zipstream import ZipstreamWrapper
 
 
@@ -87,7 +87,7 @@ class DCESerializer(base.ModelSerializer):
     Serializer for DatasetCollectionElements.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.hda_serializer = hdas.HDASerializer(app)
         self.dc_serializer = DCSerializer(app, dce_serializer=self)
@@ -121,7 +121,7 @@ class DCSerializer(base.ModelSerializer):
     Serializer for DatasetCollections.
     """
 
-    def __init__(self, app: StructuredApp, dce_serializer=None):
+    def __init__(self, app: MinimalManagerApp, dce_serializer=None):
         super().__init__(app)
         self.dce_serializer = dce_serializer or DCESerializer(app)
 
@@ -160,7 +160,7 @@ class DCASerializer(base.ModelSerializer):
     Base (abstract) Serializer class for HDCAs and LDCAs.
     """
 
-    def __init__(self, app: StructuredApp, dce_serializer=None):
+    def __init__(self, app: MinimalManagerApp, dce_serializer=None):
         super().__init__(app)
         self.dce_serializer = dce_serializer or DCESerializer(app)
 
@@ -215,7 +215,7 @@ class HDCASerializer(
     Serializer for HistoryDatasetCollectionAssociations.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.hdca_manager = HDCAManager(app)
 
diff --git a/lib/galaxy/managers/histories.py b/lib/galaxy/managers/histories.py
index 84fd2c5a121..b3975772f94 100644
--- a/lib/galaxy/managers/histories.py
+++ b/lib/galaxy/managers/histories.py
@@ -5,6 +5,7 @@ Histories are containers for datasets or dataset collections
 created (or copied) by users over the course of an analysis.
 """
 import logging
+from typing import Optional
 
 from sqlalchemy import (
     asc,
@@ -21,7 +22,8 @@ from galaxy.managers import (
     history_contents,
     sharable
 )
-from galaxy.structured_app import StructuredApp
+from galaxy.schema.fields import EncodedDatabaseIdField
+from galaxy.structured_app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -38,7 +40,7 @@ class HistoryManager(sharable.SharableModelManager, deletable.PurgableManagerMix
 
     # TODO: incorporate imp/exp (or alias to)
 
-    def __init__(self, app: StructuredApp, hda_manager: hdas.HDAManager, contents_manager: history_contents.HistoryContentsManager, contents_filters: history_contents.HistoryContentsFilters):
+    def __init__(self, app: MinimalManagerApp, hda_manager: hdas.HDAManager, contents_manager: history_contents.HistoryContentsManager, contents_filters: history_contents.HistoryContentsFilters):
         super().__init__(app)
         self.hda_manager = hda_manager
         self.contents_manager = contents_manager
@@ -172,7 +174,7 @@ class HistoryManager(sharable.SharableModelManager, deletable.PurgableManagerMix
 
 class HistoryExportView:
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
 
     def get_exports(self, trans, history_id):
@@ -224,7 +226,7 @@ class HistorySerializer(sharable.SharableModelSerializer, deletable.PurgableSeri
     model_manager_class = HistoryManager
     SINGLE_CHAR_ABBR = 'h'
 
-    def __init__(self, app: StructuredApp, hda_manager: hdas.HDAManager, hda_serializer: hdas.HDASerializer, history_contents_serializer: history_contents.HistoryContentsSerializer):
+    def __init__(self, app: MinimalManagerApp, hda_manager: hdas.HDAManager, hda_serializer: hdas.HDASerializer, history_contents_serializer: history_contents.HistoryContentsSerializer):
         super().__init__(app)
 
         self.history_manager = self.manager
@@ -443,7 +445,7 @@ class HistoryDeserializer(sharable.SharableModelDeserializer, deletable.Purgable
     """
     model_manager_class = HistoryManager
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.history_manager = self.manager
 
@@ -471,3 +473,25 @@ class HistoryFilters(sharable.SharableModelFilters, deletable.PurgableFiltersMix
             'create_time': {'op': ('le', 'ge', 'gt', 'lt'), 'val': self.parse_date},
             'update_time': {'op': ('le', 'ge', 'gt', 'lt'), 'val': self.parse_date},
         })
+
+
+class HistoriesService:
+    """Common interface/service logic for interactions with histories in the context of the API.
+
+    Provides the logic of the actions invoked by API controllers and uses type definitions
+    and pydantic models to declare its parameters and return types.
+    """
+
+    def __init__(self, app: MinimalManagerApp, manager: HistoryManager, serializer: HistorySerializer):
+        self.app = app
+        self.manager = manager
+        self.serializer = serializer
+        self.shareable_service = sharable.ShareableService(self.manager, self.serializer)
+
+    # TODO: add the rest of the API actions here and call them directly from the API controller
+
+    def sharing(self, trans, id: EncodedDatabaseIdField, payload: Optional[sharable.SharingPayload] = None) -> sharable.SharingStatus:
+        """Allows to publish or share with other users the given resource (by id) and returns the current sharing
+        status of the resource.
+        """
+        return self.shareable_service.sharing(trans, id, payload)
diff --git a/lib/galaxy/managers/history_contents.py b/lib/galaxy/managers/history_contents.py
index 9765a7c0a95..d8d4db39973 100644
--- a/lib/galaxy/managers/history_contents.py
+++ b/lib/galaxy/managers/history_contents.py
@@ -32,7 +32,7 @@ from galaxy.managers import (
     taggable,
     tools
 )
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -73,7 +73,7 @@ class HistoryContentsManager(containers.ContainerManagerMixin):
     )
     default_order_by = 'hid'
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
         self.contained_manager = app[self.contained_class_manager_class]
         self.subcontainer_manager = app[self.subcontainer_class_manager_class]
@@ -427,7 +427,7 @@ class HistoryContentsSerializer(base.ModelSerializer, deletable.PurgableSerializ
     """
     model_manager_class = HistoryContentsManager
 
-    def __init__(self, app: StructuredApp, **kwargs):
+    def __init__(self, app: MinimalManagerApp, **kwargs):
         super().__init__(app, **kwargs)
 
         self.default_view = 'summary'
diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
index 18385e3e76b..db08253505c 100644
--- a/lib/galaxy/managers/jobs.py
+++ b/lib/galaxy/managers/jobs.py
@@ -9,6 +9,7 @@ from pydantic import (
 )
 from sqlalchemy import and_, false, func, or_
 from sqlalchemy.orm import aliased
+from sqlalchemy.orm.scoping import scoped_session
 from sqlalchemy.sql import select
 
 from galaxy import model
@@ -21,6 +22,7 @@ from galaxy.managers.collections import DatasetCollectionManager
 from galaxy.managers.datasets import DatasetManager
 from galaxy.managers.hdas import HDAManager
 from galaxy.managers.lddas import LDDAManager
+from galaxy.security.idencoding import IdEncodingHelper
 from galaxy.structured_app import StructuredApp
 from galaxy.util import (
     defaultdict,
@@ -96,17 +98,17 @@ class JobSearch:
     """Search for jobs using tool inputs or other jobs"""
     def __init__(
         self,
-        app: StructuredApp,
+        sa_session: scoped_session,
         hda_manager: HDAManager,
         dataset_collection_manager: DatasetCollectionManager,
-        ldda_manager: LDDAManager
+        ldda_manager: LDDAManager,
+        id_encoding_helper: IdEncodingHelper,
     ):
-        self.app = app
-        self.sa_session = app.model.context
+        self.sa_session = sa_session
         self.hda_manager = hda_manager
         self.dataset_collection_manager = dataset_collection_manager
         self.ldda_manager = ldda_manager
-        self.decode_id = self.app.security.decode_id
+        self.decode_id = id_encoding_helper.decode_id
 
     def by_tool_input(self, trans, tool_id, tool_version, param=None, param_dump=None, job_state='ok'):
         """Search for jobs producing same results using the 'inputs' part of a tool POST."""
@@ -394,6 +396,8 @@ class JobSearch:
 def view_show_job(trans, job, full: bool) -> typing.Dict:
     is_admin = trans.user_is_admin
     job_dict = trans.app.security.encode_all_ids(job.to_dict('element', system_details=is_admin), True)
+    if trans.app.config.expose_dataset_path and 'command_line' not in job_dict:
+        job_dict['command_line'] = job.command_line
     if full:
         job_dict.update(dict(
             tool_stdout=job.tool_stdout,
diff --git a/lib/galaxy/managers/lddas.py b/lib/galaxy/managers/lddas.py
index 53d2a0a9b28..5f088b32078 100644
--- a/lib/galaxy/managers/lddas.py
+++ b/lib/galaxy/managers/lddas.py
@@ -3,7 +3,7 @@ import logging
 from galaxy import model, util
 from galaxy.managers import base as manager_base
 from galaxy.managers.datasets import DatasetAssociationManager
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -14,7 +14,7 @@ class LDDAManager(DatasetAssociationManager):
     """
     model_class = model.LibraryDatasetDatasetAssociation
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         """
         Set up and initialize other managers needed by lddas.
         """
diff --git a/lib/galaxy/managers/metrics.py b/lib/galaxy/managers/metrics.py
index 66df5c3e3cd..6ff09336451 100644
--- a/lib/galaxy/managers/metrics.py
+++ b/lib/galaxy/managers/metrics.py
@@ -13,7 +13,7 @@ from pydantic import (
     Field,
 )
 
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -72,7 +72,7 @@ TimeSeriesTupleGenerator = Generator[TimeSeriesTuple, None, None]
 class MetricsManager:
     """Interface/service object shared by controllers for interacting with metrics."""
 
-    def __init__(self, app: StructuredApp) -> None:
+    def __init__(self, app: MinimalManagerApp) -> None:
         self._app = app
         #: set to true to send additional debugging info to the log
         self.debugging = True
diff --git a/lib/galaxy/managers/pages.py b/lib/galaxy/managers/pages.py
index 723106d72a0..18ef7921366 100644
--- a/lib/galaxy/managers/pages.py
+++ b/lib/galaxy/managers/pages.py
@@ -32,7 +32,7 @@ from galaxy.managers.markdown_util import (
 )
 from galaxy.model.item_attrs import UsesAnnotations
 from galaxy.schema.fields import EncodedDatabaseIdField
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.util import unicodify
 from galaxy.util.sanitize_html import sanitize_html
 
@@ -190,13 +190,17 @@ class PageSummaryList(BaseModel):
     )
 
 
-class PagesManager:
-    """
-    Common interface/service logic for interactions with pages.
+class PagesService:
+    """Common interface/service logic for interactions with pages in the context of the API.
+
+    Provides the logic of the actions invoked by API controllers and uses type definitions
+    and pydantic models to declare its parameters and return types.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.manager = PageManager(app)
+        self.serializer = PageSerializer(app)
+        self.shareable_service = sharable.ShareableService(self.manager, self.serializer)
 
     def index(self, trans, deleted: bool = False) -> PageSummaryList:
         """Return a list of Pages viewable by the user
@@ -252,8 +256,7 @@ class PagesManager:
         trans.sa_session.flush()
 
     def show(self, trans, id: EncodedDatabaseIdField) -> PageDetails:
-        """
-            View a page summary and the content of the latest revision
+        """View a page summary and the content of the latest revision
 
         :param  id:    ID of page to be displayed
 
@@ -269,8 +272,6 @@ class PagesManager:
 
     def show_pdf(self, trans, id: EncodedDatabaseIdField):
         """
-        GET /api/pages/{id}.pdf
-
         View a page summary and the content of the latest revision as PDF.
 
         :param  id: ID of page to be displayed
@@ -285,10 +286,15 @@ class PagesManager:
         trans.response.set_content_type("application/pdf")
         return internal_galaxy_markdown_to_pdf(trans, internal_galaxy_markdown, 'page')
 
+    def sharing(self, trans, id: EncodedDatabaseIdField, payload: Optional[sharable.SharingPayload] = None) -> sharable.SharingStatus:
+        """Allows to publish or share with other users the given resource (by id) and returns the current sharing
+        status of the resource.
+        """
+        return self.shareable_service.sharing(trans, id, payload)
+
 
 class PageManager(sharable.SharableModelManager, UsesAnnotations):
-    """
-    """
+    """Provides operations for managing a Page."""
 
     model_class = model.Page
     foreign_key_name = 'page'
@@ -298,7 +304,7 @@ class PageManager(sharable.SharableModelManager, UsesAnnotations):
     annotation_assoc = model.PageAnnotationAssociation
     rating_assoc = model.PageRatingAssociation
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         """
         """
         super().__init__(app)
@@ -421,7 +427,7 @@ class PageSerializer(sharable.SharableModelSerializer):
     model_manager_class = PageManager
     SINGLE_CHAR_ABBR = 'p'
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.page_manager = PageManager(app)
 
@@ -442,7 +448,7 @@ class PageDeserializer(sharable.SharableModelDeserializer):
     """
     model_manager_class = PageManager
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.page_manager = self.manager
 
diff --git a/lib/galaxy/managers/remote_files.py b/lib/galaxy/managers/remote_files.py
index a7dc50a550e..9d40209fc83 100644
--- a/lib/galaxy/managers/remote_files.py
+++ b/lib/galaxy/managers/remote_files.py
@@ -12,7 +12,7 @@ from typing import (
 from pydantic.tools import parse_obj_as
 
 from galaxy import exceptions
-from galaxy.app import StructuredApp
+from galaxy.app import MinimalManagerApp
 from galaxy.files import (
     ConfiguredFileSources,
     ProvidesUserFileSourcesUserContext,
@@ -37,7 +37,7 @@ class RemoteFilesManager:
     Interface/service object for interacting with remote files.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self._app = app
 
     def index(
diff --git a/lib/galaxy/managers/sharable.py b/lib/galaxy/managers/sharable.py
index 80876dad3cd..5782895eae8 100644
--- a/lib/galaxy/managers/sharable.py
+++ b/lib/galaxy/managers/sharable.py
@@ -11,8 +11,16 @@ A sharable Galaxy object:
 """
 import logging
 import re
-from typing import Optional, Type
+from typing import (
+    List,
+    Optional,
+    Type,
+)
 
+from pydantic import (
+    BaseModel,
+    Field,
+)
 from sqlalchemy import true
 
 from galaxy import exceptions
@@ -25,7 +33,9 @@ from galaxy.managers import (
     users
 )
 from galaxy.model import UserShareAssociation
-from galaxy.structured_app import StructuredApp
+from galaxy.schema.fields import EncodedDatabaseIdField
+from galaxy.structured_app import MinimalManagerApp
+from galaxy.util import ready_name_for_url
 
 log = logging.getLogger(__name__)
 
@@ -41,7 +51,7 @@ class SharableModelManager(base.ModelManager, secured.OwnableManagerMixin, secur
     #: the single character abbreviation used in username_and_slug: e.g. 'h' for histories: u/user/h/slug
     SINGLE_CHAR_ABBR: Optional[str] = None
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         # user manager is needed to check access/ownership/admin
         self.user_manager = users.UserManager(app)
@@ -461,3 +471,222 @@ class SharableModelFilters(base.ModelFilterParser,
             # chose by user should prob. only be available for admin? (most often we'll only need trans.user)
             # 'user'          : { 'op': ( 'eq' ), 'val': self.parse_id_list },
         })
+
+
+class SharingPayload(BaseModel):
+    action: str = Field(  # TODO: this seems like it should be a list of actions instead of separating them by '-'
+        ...,  # Mark this field as required
+        title="Action",
+        description=(
+            "The name of the sharing action. "
+            "Can be one (or multiple values separated by '-') of the following: "
+            "make_accessible_via_link, make_accessible_and_publish, publish, "
+            "unpublish, disable_link_access, disable_link_access_and_unpublish, unshare_user"
+        ),
+    )
+    user_id: Optional[EncodedDatabaseIdField] = Field(
+        None,
+        title="User ID",
+        description=(
+            "The ID of the user with whom this resource will be shared. "
+            "*Required* when the action is `unshare_user`."
+        ),
+    )
+
+
+class UserEmail(BaseModel):
+    id: EncodedDatabaseIdField = Field(
+        ...,  # Mark this field as required
+        title="User ID",
+        description="The encoded ID of the user.",
+    )
+    email: str = Field(
+        ...,  # Mark this field as required
+        title="Email",
+        description="The email of the user.",
+    )
+
+
+class SharingStatus(BaseModel):
+    id: EncodedDatabaseIdField = Field(
+        ...,  # Mark this field as required
+        title="ID",
+        description="The encoded ID of the resource to be shared.",
+    )
+    title: str = Field(
+        ...,  # Mark this field as required
+        title="Title",
+        description="The title or name of the resource.",
+    )
+    importable: bool = Field(
+        ...,  # Mark this field as required
+        title="Importable",
+        description="Whether this resource can be published using a link.",
+    )
+    published: bool = Field(
+        ...,  # Mark this field as required
+        title="Published",
+        description="Whether this resource is currently published.",
+    )
+    users_shared_with: List[UserEmail] = Field(
+        [],
+        title="Users shared with",
+        description="The list of encoded ids for users the resource has been shared.",
+    )
+    username_and_slug: Optional[str] = Field(
+        None,
+        title="Username and slug",
+        description="The relative URL in the form of /u/{username}/{resource_single_char}/{slug}",
+    )
+    skipped: Optional[bool] = Field(
+        None,
+        title="Skipped",
+        description="Indicates that some of the resources within this object were not published due to an error.",
+    )
+
+
+class SlugBuilder:
+    """Builder for creating slugs out of items."""
+
+    def create_item_slug(self, sa_session, item) -> bool:
+        """Create/set item slug.
+
+        Slug is unique among user's importable items for item's class.
+
+        :param sa_session: Database session context.
+        :param item: The item to create/update its slug.
+        :type item: [type]
+        :return: Returns true if item's slug was set/changed; false otherwise.
+        :rtype: bool
+        """
+        cur_slug = item.slug
+
+        # Setup slug base.
+        if cur_slug is None or cur_slug == '':
+            # Item can have either a name or a title.
+            item_name = ''
+            if hasattr(item, 'name'):
+                item_name = item.name
+            elif hasattr(item, 'title'):
+                item_name = item.title
+            slug_base = ready_name_for_url(item_name.lower())
+        else:
+            slug_base = cur_slug
+
+        # Using slug base, find a slug that is not taken. If slug is taken,
+        # add integer to end.
+        new_slug = slug_base
+        count = 1
+        # Ensure unique across model class and user and don't include this item
+        # in the check in case it has previously been assigned a valid slug.
+        while sa_session.query(item.__class__).filter(item.__class__.user == item.user, item.__class__.slug == new_slug, item.__class__.id != item.id).count() != 0:
+            # Slug taken; choose a new slug based on count. This approach can
+            # handle numerous items with the same name gracefully.
+            new_slug = f'{slug_base}-{count}'
+            count += 1
+
+        # Set slug and return.
+        item.slug = new_slug
+        return item.slug == cur_slug
+
+
+class ShareableService:
+    """ Provides the logic used by the API to share resources with other users."""
+
+    def __init__(self, manager: SharableModelManager, serializer: SharableModelSerializer) -> None:
+        self.manager = manager
+        self.serializer = serializer
+        self.slug_builder = SlugBuilder()
+
+    def sharing(self, trans, id: EncodedDatabaseIdField, payload: Optional[SharingPayload] = None) -> SharingStatus:
+        """Allows to publish or share with other users the given resource (by id) and returns the current sharing
+        status of the resource.
+
+        :param id: The encoded ID of the resource to share.
+        :type id: EncodedDatabaseIdField
+        :param payload: The options to share this resource, defaults to None
+        :type payload: Optional[sharable.SharingPayload], optional
+        :return: The current sharing status of the resource.
+        :rtype: sharable.SharingStatus
+        """
+        skipped = False
+        class_name = self.manager.model_class.__name__
+        item = base.get_object(trans, id, class_name, check_ownership=True, check_accessible=True, deleted=False)
+        actions = []
+        if payload:
+            actions += payload.action.split("-")
+        for action in actions:
+            if action == "make_accessible_via_link":
+                self._make_item_accessible(trans.sa_session, item)
+                if hasattr(item, "has_possible_members") and item.has_possible_members:
+                    skipped = self._make_members_public(trans, item)
+            elif action == "make_accessible_and_publish":
+                self._make_item_accessible(trans.sa_session, item)
+                if hasattr(item, "has_possible_members") and item.has_possible_members:
+                    skipped = self._make_members_public(trans, item)
+                item.published = True
+            elif action == "publish":
+                if item.importable:
+                    item.published = True
+                    if hasattr(item, "has_possible_members") and item.has_possible_members:
+                        skipped = self._make_members_public(trans, item)
+                else:
+                    raise exceptions.MessageException("%s not importable." % class_name)
+            elif action == "disable_link_access":
+                item.importable = False
+            elif action == "unpublish":
+                item.published = False
+            elif action == "disable_link_access_and_unpublish":
+                item.importable = item.published = False
+            elif action == "unshare_user":
+                if payload is None or payload.user_id is None:
+                    raise exceptions.MessageException(f"Missing required user_id to perform {action}")
+                user = trans.sa_session.query(trans.app.model.User).get(trans.app.security.decode_id(payload.user_id))
+                class_name_lc = class_name.lower()
+                ShareAssociation = getattr(trans.app.model, "%sUserShareAssociation" % class_name)
+                usas = trans.sa_session.query(ShareAssociation).filter_by(**{"user": user, class_name_lc: item}).all()
+                if not usas:
+                    raise exceptions.MessageException("%s was not shared with user." % class_name)
+                for usa in usas:
+                    trans.sa_session.delete(usa)
+            trans.sa_session.add(item)
+            trans.sa_session.flush()
+        if item.importable and not item.slug:
+            self._make_item_accessible(trans.sa_session, item)
+        item_dict = self.serializer.serialize_to_view(item,
+            user=trans.user, trans=trans, default_view="sharing")
+        item_dict["users_shared_with"] = [{"id": self.manager.app.security.encode_id(a.user.id), "email": a.user.email} for a in item.users_shared_with]
+        if skipped:
+            item_dict["skipped"] = True
+        return SharingStatus.parse_obj(item_dict)
+
+    def _is_valid_slug(self, slug):
+        """ Returns true if slug is valid. """
+        return base.is_valid_slug(slug)
+
+    def _make_item_accessible(self, sa_session, item):
+        """ Makes item accessible--viewable and importable--and sets item's slug.
+            Does not flush/commit changes, however. Item must have name, user,
+            importable, and slug attributes. """
+        item.importable = True
+        self.slug_builder.create_item_slug(sa_session, item)
+
+    def _make_members_public(self, trans, item):
+        """ Make the non-purged datasets in history public
+        Performs pemissions check.
+        """
+        # TODO eventually we should handle more classes than just History
+        skipped = False
+        for hda in item.activatable_datasets:
+            dataset = hda.dataset
+            if not trans.app.security_agent.dataset_is_public(dataset):
+                if trans.app.security_agent.can_manage_dataset(trans.user.all_roles(), dataset):
+                    try:
+                        trans.app.security_agent.make_dataset_public(hda.dataset)
+                    except Exception:
+                        log.warning("Unable to make dataset with id: %s public", dataset.id)
+                        skipped = True
+                else:
+                    log.warning("User without permissions tried to make dataset with id: %s public", dataset.id)
+                    skipped = True
+        return skipped
diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
index e8b0493bc31..cb9f4c67b73 100644
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -30,7 +30,7 @@ from galaxy.security.validate_user_input import (
     validate_password,
     validate_publicname
 )
-from galaxy.structured_app import BasicApp, StructuredApp
+from galaxy.structured_app import BasicApp, MinimalManagerApp
 from galaxy.util.hash_util import new_secure_hash
 from galaxy.web import url_for
 
@@ -611,7 +611,7 @@ class UserManager(base.ModelManager, deletable.PurgableManagerMixin):
 class UserSerializer(base.ModelSerializer, deletable.PurgableSerializerMixin):
     model_manager_class = UserManager
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         """
         Convert a User and associated data to a dictionary representation.
         """
diff --git a/lib/galaxy/managers/visualizations.py b/lib/galaxy/managers/visualizations.py
index c7ae924061a..84f0d1fa1f9 100644
--- a/lib/galaxy/managers/visualizations.py
+++ b/lib/galaxy/managers/visualizations.py
@@ -5,10 +5,12 @@ Visualizations are saved configurations/variables used to
 reproduce a specific view in a Galaxy visualization.
 """
 import logging
+from typing import Optional
 
 from galaxy import model
 from galaxy.managers import sharable
-from galaxy.structured_app import StructuredApp
+from galaxy.schema.fields import EncodedDatabaseIdField
+from galaxy.structured_app import MinimalManagerApp
 
 log = logging.getLogger(__name__)
 
@@ -41,7 +43,7 @@ class VisualizationSerializer(sharable.SharableModelSerializer):
     model_manager_class = VisualizationManager
     SINGLE_CHAR_ABBR = 'v'
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         super().__init__(app)
         self.visualization_manager = self.manager
 
@@ -71,3 +73,25 @@ class VisualizationDeserializer(sharable.SharableModelDeserializer):
         self.deserializers.update({
         })
         self.deserializable_keyset.update(self.deserializers.keys())
+
+
+class VisualizationsService:
+    """Common interface/service logic for interactions with visualizations in the context of the API.
+
+    Provides the logic of the actions invoked by API controllers and uses type definitions
+    and pydantic models to declare its parameters and return types.
+    """
+
+    def __init__(self, app: MinimalManagerApp, manager: VisualizationManager, serializer: VisualizationSerializer):
+        self.app = app
+        self.manager = manager
+        self.serializer = serializer
+        self.shareable_service = sharable.ShareableService(self.manager, self.serializer)
+
+    # TODO: add the rest of the API actions here and call them directly from the API controller
+
+    def sharing(self, trans, id: EncodedDatabaseIdField, payload: Optional[sharable.SharingPayload] = None) -> sharable.SharingStatus:
+        """Allows to publish or share with other users the given resource (by id) and returns the current sharing
+        status of the resource.
+        """
+        return self.shareable_service.sharing(trans, id, payload)
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index aaf341d7edd..5ee98861d8e 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -26,7 +26,7 @@ from galaxy import (
 )
 from galaxy.jobs.actions.post import ActionBox
 from galaxy.model.item_attrs import UsesAnnotations
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.tools.parameters import (
     params_to_incoming,
     visit_input_values
@@ -69,7 +69,7 @@ class WorkflowsManager:
     the galaxy.workflow module.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
 
     def get_stored_workflow(self, trans, workflow_id, by_stored_id=True):
@@ -306,7 +306,7 @@ CreatedWorkflow = namedtuple("CreatedWorkflow", ["stored_workflow", "workflow",
 
 class WorkflowContentsManager(UsesAnnotations):
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
         self._resource_mapper_function = get_resource_mapper_function(app)
 
@@ -361,8 +361,9 @@ class WorkflowContentsManager(UsesAnnotations):
             raise exceptions.RequestParameterInvalidException(f"Invalid workflow format detected [{data}]")
 
         workflow_input_name = data['name']
-        if source:
-            name = f"{workflow_input_name} (imported from {source})"
+        imported_sufix = f"(imported from {source})"
+        if source and imported_sufix not in workflow_input_name:
+            name = f"{workflow_input_name} {imported_sufix}"
         else:
             name = workflow_input_name
         workflow, missing_tool_tups = self._workflow_from_raw_description(
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 9cfba86966f..c102fe6ab23 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -401,7 +401,7 @@ class User(Dictifiable, RepresentById):
         extra_user_preferences = self.preferences.get('extra_user_preferences')
         if extra_user_preferences:
             try:
-                data = json.loads(extra_user_preferences)
+                data.update(json.loads(extra_user_preferences))
             except Exception:
                 pass
         return data
@@ -755,8 +755,11 @@ class Job(JobLike, UsesCreateAndUpdateTime, Dictifiable, RepresentById):
         self.state_history = []
         self.imported = False
         self.handler = None
+        self.create_time = None
         self.exit_code = None
+        self.history_id = None
         self.job_messages = None
+        self.update_time = None
         self._init_metrics()
         self.state_history.append(JobStateHistory(self))
 
@@ -1538,7 +1541,7 @@ class ImplicitCollectionJobs(RepresentById):
 class ImplicitCollectionJobsJobAssociation(RepresentById):
 
     def __init__(self):
-        pass
+        self.implicit_collection_jobs_id = None
 
 
 class PostJobAction(RepresentById):
@@ -2694,10 +2697,11 @@ class DatasetInstance:
         INVALID = 'invalid'
         OK = 'ok'
 
-    def __init__(self, id=None, hid=None, name=None, info=None, blurb=None, peek=None, tool_version=None, extension=None,
-                 dbkey=None, metadata=None, history=None, dataset=None, deleted=False, designation=None,
-                 parent_id=None, validated_state='unknown', validated_state_message=None, visible=True, create_dataset=False, sa_session=None,
-                 extended_metadata=None, flush=True):
+    def __init__(self, id=None, hid=None, name=None, info=None, blurb=None, peek=None, tool_version=None,
+                 extension=None, dbkey=None, metadata=None, history=None, dataset=None, deleted=False,
+                 designation=None, parent_id=None, validated_state='unknown', validated_state_message=None,
+                 visible=True, create_dataset=False, sa_session=None, extended_metadata=None, flush=True,
+                 creating_job_id=None):
         self.name = name or "Unnamed dataset"
         self.id = id
         self.info = info
@@ -2720,6 +2724,7 @@ class DatasetInstance:
         if not dataset and create_dataset:
             # Had to pass the sqlalchemy session in order to create a new dataset
             dataset = Dataset(state=Dataset.states.NEW)
+            dataset.job_id = creating_job_id
             if flush:
                 sa_session.add(dataset)
                 sa_session.flush()
@@ -3085,6 +3090,7 @@ class DatasetInstance:
 
     @property
     def creating_job(self):
+        # TODO this should work with `return self.dataset.job` (revise failing unit tests)
         creating_job_associations = None
         if self.creating_job_associations:
             creating_job_associations = self.creating_job_associations
@@ -3310,6 +3316,8 @@ class HistoryDatasetAssociation(DatasetInstance, HasTags, Dictifiable, UsesAnnot
 
     def copy_tags_to(self, copy_tags=None):
         if copy_tags is not None:
+            if isinstance(copy_tags, dict):
+                copy_tags = copy_tags.values()
             for tag in copy_tags:
                 copied_tag = tag.copy(cls=HistoryDatasetAssociationTagAssociation)
                 self.tags.append(copied_tag)
@@ -3497,7 +3505,7 @@ class HistoryDatasetAssociation(DatasetInstance, HasTags, Dictifiable, UsesAnnot
                     continue
                 val = val.file_name
             # If no value for metadata, look in datatype for metadata.
-            elif val is None and hasattr(hda.datatype, name):
+            elif not hda.metadata.element_is_set(name) and hasattr(hda.datatype, name):
                 val = getattr(hda.datatype, name)
             rval['metadata_' + name] = val
         return rval
@@ -4286,7 +4294,7 @@ class DatasetCollection(Dictifiable, UsesAnnotations, RepresentById):
         error_message = f"Dataset collection has no {get_by_attribute} with key {key}."
         raise KeyError(error_message)
 
-    def copy(self, destination=None, element_destination=None, flush=True):
+    def copy(self, destination=None, element_destination=None, dataset_instance_attributes=None, flush=True):
         new_collection = DatasetCollection(
             collection_type=self.collection_type,
             element_count=self.element_count
@@ -4296,6 +4304,7 @@ class DatasetCollection(Dictifiable, UsesAnnotations, RepresentById):
                 new_collection,
                 destination=destination,
                 element_destination=element_destination,
+                dataset_instance_attributes=dataset_instance_attributes,
                 flush=flush
             )
         object_session(self).add(new_collection)
@@ -4537,7 +4546,7 @@ class HistoryDatasetCollectionAssociation(DatasetCollectionInstance,
                 break
         return matching_collection
 
-    def copy(self, element_destination=None):
+    def copy(self, element_destination=None, dataset_instance_attributes=None):
         """
         Create a copy of this history dataset collection association. Copy
         underlying collection.
@@ -4558,6 +4567,7 @@ class HistoryDatasetCollectionAssociation(DatasetCollectionInstance,
         collection_copy = self.collection.copy(
             destination=hdca,
             element_destination=element_destination,
+            dataset_instance_attributes=dataset_instance_attributes,
             flush=False,
         )
         hdca.collection = collection_copy
@@ -4719,17 +4729,22 @@ class DatasetCollectionElement(Dictifiable, RepresentById):
         else:
             return [element_object]
 
-    def copy_to_collection(self, collection, destination=None, element_destination=None, flush=True):
+    def copy_to_collection(self, collection, destination=None, element_destination=None, dataset_instance_attributes=None, flush=True):
+        dataset_instance_attributes = dataset_instance_attributes or {}
         element_object = self.element_object
         if element_destination:
             if self.is_collection:
                 element_object = element_object.copy(
                     destination=destination,
                     element_destination=element_destination,
+                    dataset_instance_attributes=dataset_instance_attributes,
                     flush=flush
                 )
             else:
                 new_element_object = element_object.copy(flush=flush, copy_tags=element_object.tags)
+                for attribute, value in dataset_instance_attributes.items():
+                    setattr(new_element_object, attribute, value)
+
                 new_element_object.visible = False
                 if destination is not None and element_object.hidden_beneath_collection_instance:
                     new_element_object.hidden_beneath_collection_instance = destination
@@ -4895,6 +4910,7 @@ class Workflow(Dictifiable, RepresentById):
         self.has_cycles = None
         self.has_errors = None
         self.steps = []
+        self.stored_workflow_id = None
         if uuid is None:
             self.uuid = uuid4()
         else:
@@ -4992,6 +5008,8 @@ class Workflow(Dictifiable, RepresentById):
         copied_workflow.has_cycles = self.has_cycles
         copied_workflow.has_errors = self.has_errors
         copied_workflow.reports_config = self.reports_config
+        copied_workflow.license = self.license
+        copied_workflow.creator_metadata = self.creator_metadata
 
         # Map old step ids to new steps
         step_mapping = {}
@@ -5321,6 +5339,7 @@ class WorkflowInvocation(UsesCreateAndUpdateTime, Dictifiable, RepresentById):
         self.subworkflow_invocations = []
         self.step_states = []
         self.steps = []
+        self.workflow_id = None
 
     def create_subworkflow_invocation_for_step(self, step):
         assert step.type == "subworkflow"
@@ -5673,6 +5692,11 @@ class WorkflowInvocationStep(Dictifiable, RepresentById):
         # CANCELLED = 'cancelled',  TODO: implement and expose
         # FAILED = 'failed',  TODO: implement and expose
 
+    def __init__(self):
+        self.implicit_collection_jobs_id = None
+        self.job_id = None
+        self.workflow_invocation_id = None
+
     @property
     def is_new(self):
         return self.state == self.states.NEW
diff --git a/lib/galaxy/model/database_utils.py b/lib/galaxy/model/database_utils.py
new file mode 100644
index 00000000000..5a949f0a0a3
--- /dev/null
+++ b/lib/galaxy/model/database_utils.py
@@ -0,0 +1,125 @@
+import sqlite3
+from contextlib import contextmanager
+
+from sqlalchemy import create_engine
+from sqlalchemy.engine.url import make_url
+from sqlalchemy.sql.compiler import IdentifierPreparer
+from sqlalchemy.sql.expression import text
+
+from galaxy.exceptions import ConfigurationError
+
+
+def database_exists(db_url, database=None):
+    """Check if database exists; connect with db_url.
+
+    If database is None, use the database name from db_url.
+    """
+    dbm = DatabaseManager.make_manager(db_url, database)
+    return dbm.exists()
+
+
+def create_database(db_url, database=None, encoding='utf8', template=None):
+    """Create database; connect with db_url.
+
+    If database is None, use the database name from db_url.
+    """
+    dbm = DatabaseManager.make_manager(db_url, database)
+    dbm.create(encoding, template)
+
+
+@contextmanager
+def sqlalchemy_engine(url):
+    engine = create_engine(url)
+    try:
+        yield engine
+    finally:
+        engine.dispose()
+
+
+class DatabaseManager:
+
+    @staticmethod
+    def make_manager(db_url, database):
+        if db_url.startswith('postgres'):
+            return PosgresDatabaseManager(db_url, database)
+        elif db_url.startswith('sqlite'):
+            return SqliteDatabaseManager(db_url, database)
+        elif db_url.startswith('mysql'):
+            return MySQLDatabaseManager(db_url, database)
+        else:
+            raise ConfigurationError(f'Invalid database URL: {db_url}')
+
+    def __init__(self, db_url, database):
+        self.url = make_url(db_url)
+        self.database = database
+        if not database:
+            self._handle_no_database()
+
+
+class PosgresDatabaseManager(DatabaseManager):
+
+    def _handle_no_database(self):
+        self.database = self.url.database  # use database from db_url
+        self.url.database = 'postgres'
+
+    def exists(self):
+        with sqlalchemy_engine(self.url) as engine:
+            stmt = text('SELECT 1 FROM pg_database WHERE datname=:database')
+            stmt = stmt.bindparams(database=self.database)
+            with engine.connect() as conn:
+                return bool(conn.scalar(stmt))
+
+    def create(self, encoding, template):
+        with sqlalchemy_engine(self.url) as engine:
+            preparer = IdentifierPreparer(engine.dialect)
+            template = template or 'template1'
+            database, template = preparer.quote(self.database), preparer.quote(template)
+            stmt = f"CREATE DATABASE {database} ENCODING '{encoding}' TEMPLATE {template}"
+            with engine.connect().execution_options(isolation_level='AUTOCOMMIT') as conn:
+                conn.execute(stmt)
+
+
+class SqliteDatabaseManager(DatabaseManager):
+
+    def _handle_no_database(self):
+        self.database = self.url.database  # use database from db_url
+
+    def exists(self):
+
+        def can_connect_to_dbfile():
+            try:
+                sqlite3.connect(f'file:{db}?mode=ro', uri=True)
+            except sqlite3.OperationalError:
+                return False
+            else:
+                return True
+
+        db = self.url.database
+        # No database or ':memory:' creates an in-memory database
+        return not db or db == ':memory:' or can_connect_to_dbfile()
+
+    def create(self, *args):
+        # Ignore any args (encoding, template)
+        sqlite3.connect(f'file:{self.url.database}', uri=True)
+
+
+class MySQLDatabaseManager(DatabaseManager):
+
+    def _handle_no_database(self):
+        self.database = self.url.database  # use database from db_url
+
+    def exists(self):
+        with sqlalchemy_engine(self.url) as engine:
+            stmt = text("SELECT schema_name FROM information_schema.schemata WHERE schema_name=:database")
+            stmt = stmt.bindparams(database=self.database)
+            with engine.connect() as conn:
+                return bool(conn.scalar(stmt))
+
+    def create(self, encoding, *arg):
+        # Ignore any args (template)
+        with sqlalchemy_engine(self.url) as engine:
+            preparer = IdentifierPreparer(engine.dialect)
+            database = preparer.quote(self.database)
+            stmt = f"CREATE DATABASE {database} CHARACTER SET = '{encoding}'"
+            with engine.connect().execution_options(isolation_level='AUTOCOMMIT') as conn:
+                conn.execute(stmt)
diff --git a/lib/galaxy/model/dataset_collections/builder.py b/lib/galaxy/model/dataset_collections/builder.py
index 05694c34289..e32d5b9f932 100644
--- a/lib/galaxy/model/dataset_collections/builder.py
+++ b/lib/galaxy/model/dataset_collections/builder.py
@@ -1,27 +1,33 @@
 from galaxy import model
+from galaxy.util.oset import OrderedSet
 from .type_description import COLLECTION_TYPE_DESCRIPTION_FACTORY
 
 
-def build_collection(type, dataset_instances):
+def build_collection(type, dataset_instances, collection=None, associated_identifiers=None):
     """
     Build DatasetCollection with populated DatasetcollectionElement objects
     corresponding to the supplied dataset instances or throw exception if
     this is not a valid collection of the specified type.
     """
-    dataset_collection = model.DatasetCollection()
-    set_collection_elements(dataset_collection, type, dataset_instances)
+    dataset_collection = collection or model.DatasetCollection()
+    associated_identifiers = associated_identifiers or set()
+    set_collection_elements(dataset_collection, type, dataset_instances, associated_identifiers)
     return dataset_collection
 
 
-def set_collection_elements(dataset_collection, type, dataset_instances):
-    element_index = 0
+def set_collection_elements(dataset_collection, type, dataset_instances, associated_identifiers):
+    new_element_keys = OrderedSet(dataset_instances.keys()) - associated_identifiers
+    new_dataset_instances = {k: dataset_instances[k] for k in new_element_keys}
+    dataset_collection.element_count = dataset_collection.element_count or 0
+    element_index = dataset_collection.element_count
     elements = []
-    for element in type.generate_elements(dataset_instances):
+    for element in type.generate_elements(new_dataset_instances):
         element.element_index = element_index
         element.collection = dataset_collection
         elements.append(element)
 
         element_index += 1
+        associated_identifiers.add(element.element_identifier)
 
     dataset_collection.element_count = element_index
     return dataset_collection
@@ -33,6 +39,9 @@ class CollectionBuilder:
     def __init__(self, collection_type_description):
         self._collection_type_description = collection_type_description
         self._current_elements = {}
+        # Store collection here so we don't recreate the collection all the time
+        self.collection = None
+        self.associated_identifiers = set()
 
     def replace_elements_in_collection(self, template_collection, replacement_dict):
         self._current_elements = self._replace_elements_in_collection(
@@ -79,13 +88,15 @@ class CollectionBuilder:
             for identifier, element in elements.items():
                 new_elements[identifier] = element.build()
             elements = new_elements
+        else:
+            self._current_elements = {}
         return elements
 
     def build(self):
         type_plugin = self._collection_type_description.rank_type_plugin()
-        collection = build_collection(type_plugin, self.build_elements())
-        collection.collection_type = self._collection_type_description.collection_type
-        return collection
+        self.collection = build_collection(type_plugin, self.build_elements(), self.collection, self.associated_identifiers)
+        self.collection.collection_type = self._collection_type_description.collection_type
+        return self.collection
 
     @property
     def _subcollection_type_description(self):
@@ -107,8 +118,11 @@ class BoundCollectionBuilder(CollectionBuilder):
         collection_type_description = COLLECTION_TYPE_DESCRIPTION_FACTORY.for_collection_type(collection_type)
         super().__init__(collection_type_description)
 
-    def populate(self):
+    def populate_partial(self):
         elements = self.build_elements()
         type_plugin = self._collection_type_description.rank_type_plugin()
-        set_collection_elements(self.dataset_collection, type_plugin, elements)
+        set_collection_elements(self.dataset_collection, type_plugin, elements, self.associated_identifiers)
+
+    def populate(self):
+        self.populate_partial()
         self.dataset_collection.mark_as_populated()
diff --git a/lib/galaxy/model/dataset_collections/types/paired.py b/lib/galaxy/model/dataset_collections/types/paired.py
index 81469b2b79e..335dcb15779 100644
--- a/lib/galaxy/model/dataset_collections/types/paired.py
+++ b/lib/galaxy/model/dataset_collections/types/paired.py
@@ -4,8 +4,6 @@ from ..types import BaseDatasetCollectionType
 FORWARD_IDENTIFIER = "forward"
 REVERSE_IDENTIFIER = "reverse"
 
-INVALID_IDENTIFIERS_MESSAGE = f"Paired instance must define '{FORWARD_IDENTIFIER}' and '{REVERSE_IDENTIFIER}' datasets ."
-
 
 class PairedDatasetCollectionType(BaseDatasetCollectionType):
     """
@@ -17,20 +15,20 @@ class PairedDatasetCollectionType(BaseDatasetCollectionType):
         pass
 
     def generate_elements(self, elements):
-        forward_dataset = elements.get(FORWARD_IDENTIFIER, None)
-        reverse_dataset = elements.get(REVERSE_IDENTIFIER, None)
-        if not forward_dataset or not reverse_dataset:
-            self._validation_failed(INVALID_IDENTIFIERS_MESSAGE)
-        left_association = DatasetCollectionElement(
-            element=forward_dataset,
-            element_identifier=FORWARD_IDENTIFIER,
-        )
-        right_association = DatasetCollectionElement(
-            element=reverse_dataset,
-            element_identifier=REVERSE_IDENTIFIER,
-        )
-        yield left_association
-        yield right_association
+        forward_dataset = elements.get(FORWARD_IDENTIFIER)
+        reverse_dataset = elements.get(REVERSE_IDENTIFIER)
+        if forward_dataset:
+            left_association = DatasetCollectionElement(
+                element=forward_dataset,
+                element_identifier=FORWARD_IDENTIFIER,
+            )
+            yield left_association
+        if reverse_dataset:
+            right_association = DatasetCollectionElement(
+                element=reverse_dataset,
+                element_identifier=REVERSE_IDENTIFIER,
+            )
+            yield right_association
 
     def prototype_elements(self):
         left_association = DatasetCollectionElement(
diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py
index e156fef42e4..4923e657bf3 100644
--- a/lib/galaxy/model/mapping.py
+++ b/lib/galaxy/model/mapping.py
@@ -271,6 +271,7 @@ model.HistoryDatasetAssociationHistory.table = Table(
 model.Dataset.table = Table(
     "dataset", metadata,
     Column("id", Integer, primary_key=True),
+    Column('job_id', Integer, ForeignKey('job.id'), index=True, nullable=True),
     Column("create_time", DateTime, default=now),
     Column("update_time", DateTime, index=True, default=now, onupdate=now),
     Column("state", TrimmedString(64), index=True),
@@ -1769,6 +1770,7 @@ simple_mapping(model.HistoryDatasetAssociation,
 )
 
 simple_mapping(model.Dataset,
+    job=relation(model.Job, primaryjoin=(model.Dataset.table.c.job_id == model.Job.table.c.id)),
     history_associations=relation(model.HistoryDatasetAssociation,
         primaryjoin=(model.Dataset.table.c.id == model.HistoryDatasetAssociation.table.c.dataset_id)),
     active_history_associations=relation(model.HistoryDatasetAssociation,
diff --git a/lib/galaxy/model/migrate/check.py b/lib/galaxy/model/migrate/check.py
index fc81b7780b8..f864ad60c72 100644
--- a/lib/galaxy/model/migrate/check.py
+++ b/lib/galaxy/model/migrate/check.py
@@ -9,9 +9,9 @@ from sqlalchemy import (
     Table
 )
 from sqlalchemy.exc import NoSuchTableError
-from sqlalchemy_utils import create_database, database_exists
 
 from galaxy.model import mapping
+from galaxy.model.database_utils import create_database, database_exists
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/model/migrate/versions/0166_job_state_summary_view.py b/lib/galaxy/model/migrate/versions/0166_job_state_summary_view.py
index 74d5b924bab..062224e7abd 100644
--- a/lib/galaxy/model/migrate/versions/0166_job_state_summary_view.py
+++ b/lib/galaxy/model/migrate/versions/0166_job_state_summary_view.py
@@ -15,12 +15,13 @@ def upgrade(migrate_engine):
     print(__doc__)
     # drop first because sqlite does not support or_replace
     downgrade(migrate_engine)
-    create_view = CreateView(HistoryDatasetCollectionJobStateSummary)
+    view = HistoryDatasetCollectionJobStateSummary
+    create_view = CreateView(view.name, view.__view__)
     # print(str(create_view.compile(migrate_engine)))
     migrate_engine.execute(create_view)
 
 
 def downgrade(migrate_engine):
-    drop_view = DropView(HistoryDatasetCollectionJobStateSummary)
+    drop_view = DropView(HistoryDatasetCollectionJobStateSummary.name)
     # print(str(drop_view.compile(migrate_engine)))
     migrate_engine.execute(drop_view)
diff --git a/lib/galaxy/model/migrate/versions/0173_add_job_id_to_dataset.py b/lib/galaxy/model/migrate/versions/0173_add_job_id_to_dataset.py
new file mode 100644
index 00000000000..1333758bc6d
--- /dev/null
+++ b/lib/galaxy/model/migrate/versions/0173_add_job_id_to_dataset.py
@@ -0,0 +1,41 @@
+"""
+Migration script for adding job_id column to dataset table.
+"""
+from __future__ import print_function
+
+import logging
+
+from sqlalchemy import (
+    Column,
+    ForeignKey,
+    Integer,
+    MetaData,
+)
+
+from galaxy.model.migrate.versions.util import (
+    add_column,
+    add_index,
+    drop_column,
+    drop_index,
+)
+
+log = logging.getLogger(__name__)
+metadata = MetaData()
+
+
+def upgrade(migrate_engine):
+    print(__doc__)
+    metadata.bind = migrate_engine
+    metadata.reflect()
+
+    job_id_column = Column('job_id', Integer, ForeignKey('job.id'))
+    add_column(job_id_column, 'dataset', metadata)
+    add_index('ix_dataset_job_id', 'dataset', 'job_id', metadata)
+
+
+def downgrade(migrate_engine):
+    metadata.bind = migrate_engine
+    metadata.reflect()
+
+    drop_column('job_id', 'dataset', metadata)
+    drop_index('ix_dataset_job_id', 'dataset', 'job_id', metadata)
diff --git a/lib/galaxy/model/orm/engine_factory.py b/lib/galaxy/model/orm/engine_factory.py
index 8d23f4288f7..5748525b421 100644
--- a/lib/galaxy/model/orm/engine_factory.py
+++ b/lib/galaxy/model/orm/engine_factory.py
@@ -3,6 +3,7 @@ import logging
 import os
 import threading
 import time
+from multiprocessing.util import register_after_fork
 
 from sqlalchemy import (
     create_engine,
@@ -87,4 +88,5 @@ def build_engine(url, engine_options, database_query_profiling_proxy=False, trac
 
     # Create the database engine
     engine = create_engine(url, **engine_options)
+    register_after_fork(engine, lambda e: e.dispose())
     return engine
diff --git a/lib/galaxy/model/orm/scripts.py b/lib/galaxy/model/orm/scripts.py
index e16fb608f82..95f38a2615e 100644
--- a/lib/galaxy/model/orm/scripts.py
+++ b/lib/galaxy/model/orm/scripts.py
@@ -136,8 +136,9 @@ def get_config(argv, use_argparse=True, cwd=None):
         db_url = properties["%sdatabase_connection" % config_prefix]
     else:
         db_url = "sqlite:///%s?isolation_level=IMMEDIATE" % os.path.join(get_data_dir(properties), default_sqlite_file)
+    install_database_connection = properties.get('install_database_connection')
 
-    return dict(db_url=db_url, repo=repo, config_file=config_file, database=database)
+    return dict(db_url=db_url, repo=repo, config_file=config_file, database=database, install_database_connection=install_database_connection)
 
 
 def manage_db():
diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py
index 37d7ab703cd..9a90c3d5057 100644
--- a/lib/galaxy/model/store/discover.py
+++ b/lib/galaxy/model/store/discover.py
@@ -20,6 +20,7 @@ from galaxy.exceptions import (
 )
 from galaxy.model.dataset_collections import builder
 from galaxy.util import (
+    chunk_iterable,
     ExecutionTimer
 )
 from galaxy.util.hash_util import HASH_NAME_MAP
@@ -27,6 +28,7 @@ from galaxy.util.hash_util import HASH_NAME_MAP
 log = logging.getLogger(__name__)
 
 UNSET = object()
+DEFAULT_CHUNK_SIZE = 1000
 
 
 class ModelPersistenceContext(metaclass=abc.ABCMeta):
@@ -35,7 +37,6 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
     This class implement the create_dataset method that takes care of populating metadata
     required for datasets and other potential model objects.
     """
-
     def create_dataset(
         self,
         ext,
@@ -57,6 +58,7 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
         hashes=None,
         created_from_basename=None,
         final_job_state='ok',
+        creating_job_id=None,
     ):
         tag_list = tag_list or []
         sources = sources or []
@@ -88,9 +90,10 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
                                                                       dbkey=dbkey,
                                                                       create_dataset=True,
                                                                       flush=False,
-                                                                      sa_session=sa_session)
-
+                                                                      sa_session=sa_session,
+                                                                      creating_job_id=creating_job_id)
                 self.persist_object(primary_data)
+
                 if init_from:
                     self.permission_provider.copy_dataset_permissions(init_from, primary_data)
                     primary_data.state = init_from.state
@@ -217,9 +220,20 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
         #    <sort regex="part_(\d+)_sample_([^_]+).fastq" by="2:lexical,1:numerical" />
         if name is None:
             name = "unnamed output"
+        if self.flush_per_n_datasets and self.flush_per_n_datasets > 0:
+            for chunk in chunk_iterable(filenames.items(), size=self.flush_per_n_datasets):
+                self._populate_elements(chunk=chunk, name=name, root_collection_builder=root_collection_builder, metadata_source_name=metadata_source_name, final_job_state=final_job_state)
+                if len(chunk) == self.flush_per_n_datasets:
+                    # In most cases we don't need to flush, that happens in the caller.
+                    # Only flush here for saving memory.
+                    root_collection_builder.populate_partial()
+                    self.flush()
+        else:
+            self._populate_elements(chunk=filenames.items(), name=name, root_collection_builder=root_collection_builder, metadata_source_name=metadata_source_name, final_job_state=final_job_state)
 
+    def _populate_elements(self, chunk, name, root_collection_builder, metadata_source_name, final_job_state):
         element_datasets = {'element_identifiers': [], 'datasets': [], 'tag_lists': [], 'paths': [], 'extra_files': []}
-        for filename, discovered_file in filenames.items():
+        for filename, discovered_file in chunk:
             create_dataset_timer = ExecutionTimer()
             fields_match = discovered_file.match
             if not fields_match:
@@ -404,6 +418,7 @@ class SessionlessModelPersistenceContext(ModelPersistenceContext):
         self.sa_session = None
         self.object_store = object_store
         self.export_store = export_store
+        self.flush_per_n_datasets = None
 
         self.job_working_directory = working_directory  # TODO: rename...
 
diff --git a/lib/galaxy/model/tool_shed_install/migrate/check.py b/lib/galaxy/model/tool_shed_install/migrate/check.py
index 92176c541f5..0e1a66248fc 100644
--- a/lib/galaxy/model/tool_shed_install/migrate/check.py
+++ b/lib/galaxy/model/tool_shed_install/migrate/check.py
@@ -12,11 +12,8 @@ from sqlalchemy import (
     Table
 )
 from sqlalchemy.exc import NoSuchTableError
-from sqlalchemy_utils import (
-    create_database,
-    database_exists,
-)
 
+from galaxy.model.database_utils import create_database, database_exists
 from galaxy.model.tool_shed_install import mapping
 
 
diff --git a/lib/galaxy/model/view/__init__.py b/lib/galaxy/model/view/__init__.py
index 6546fce74b4..ae1958da9fb 100644
--- a/lib/galaxy/model/view/__init__.py
+++ b/lib/galaxy/model/view/__init__.py
@@ -1,14 +1,11 @@
 """
 Galaxy sql view models
 """
-from sqlalchemy import Integer, MetaData
+from sqlalchemy import Integer
 from sqlalchemy.orm import mapper
 from sqlalchemy.sql import column, text
-from sqlalchemy_utils import create_view
 
-from .utils import View
-
-metadata = MetaData()
+from galaxy.model.view.utils import View
 
 AGGREGATE_STATE_QUERY = """
 SELECT
@@ -38,6 +35,7 @@ GROUP BY hdca.id
 
 
 class HistoryDatasetCollectionJobStateSummary(View):
+    name = 'collection_job_state_summary_view'
 
     __view__ = text(AGGREGATE_STATE_QUERY).columns(
         column('hdca_id', Integer),
@@ -55,8 +53,8 @@ class HistoryDatasetCollectionJobStateSummary(View):
         column('upload', Integer),
         column('all_jobs', Integer)
     )
-
-    __table__ = create_view('collection_job_state_summary_view', __view__, metadata)
+    pkeys = {'hdca_id'}
+    __table__ = View._make_table(name, __view__, pkeys)
 
 
 mapper(HistoryDatasetCollectionJobStateSummary, HistoryDatasetCollectionJobStateSummary.__table__)
diff --git a/lib/galaxy/model/view/utils.py b/lib/galaxy/model/view/utils.py
index cbc6f55fabb..075be7bba08 100644
--- a/lib/galaxy/model/view/utils.py
+++ b/lib/galaxy/model/view/utils.py
@@ -1,34 +1,67 @@
 """
-View wrappers, currently using sqlalchemy_views
+View wrappers
 """
 from inspect import getmembers
 
+from sqlalchemy import (
+    Column,
+    MetaData,
+    Table,
+)
 from sqlalchemy.ext import compiler
-from sqlalchemy_utils import view
+from sqlalchemy.schema import DDLElement
 
 
 class View:
-    is_view = True
+    """Base class for Views."""
+
+    @staticmethod
+    def _make_table(name, selectable, pkeys):
+        """ Create a view.
+
+        :param name: The name of the view.
+        :param selectable: SQLAlchemy selectable.
+        :param pkeys: set of primary keys for the selectable.
+        """
+        columns = [
+            Column(
+                c.name,
+                c.type,
+                primary_key=(c.name in pkeys)
+            )
+            for c in selectable.c
+        ]
+        # We do not use the metadata object from model.mapping.py that contains all the Table objects
+        # because that would create a circular import (create_view is called from View objects
+        # in model.view; but those View objects are imported into model.mapping.py where the
+        # metadata object we need is defined). Thus, we do not use the after_create/before_drop
+        # hooks to automate creating/dropping views.  Instead, this is taken care of in install_views().
+
+        # The metadata object passed to Table() should be empty: this table is internal to a View
+        # object and is not intended to be created in the database.
+        return Table(name, MetaData(), *columns)
 
 
-class DropView(view.DropView):
-    def __init__(self, ViewModel, **kwargs):
-        super().__init__(str(ViewModel.__table__.name), **kwargs)
+class CreateView(DDLElement):
+    def __init__(self, name, selectable):
+        self.name = name
+        self.selectable = selectable
 
 
-@compiler.compiles(DropView, "sqlite")
-def compile_drop_materialized_view(element, compiler, **kw):
-    # modified because sqlalchemy_utils adds a cascade for
-    # sqlite even though sqlite does not support cascade keyword
-    return 'DROP {}VIEW IF EXISTS {}'.format(
-        'MATERIALIZED ' if element.materialized else '',
-        element.name
-    )
+class DropView(DDLElement):
+    def __init__(self, name):
+        self.name = name
 
 
-class CreateView(view.CreateView):
-    def __init__(self, ViewModel, **kwargs):
-        super().__init__(str(ViewModel.__table__.name), ViewModel.__view__, **kwargs)
+@compiler.compiles(CreateView)
+def compile_create_view(element, compiler, **kw):
+    compiled_selectable = compiler.sql_compiler.process(element.selectable, literal_binds=True)
+    return f'CREATE VIEW {element.name} AS {compiled_selectable}'
+
+
+@compiler.compiles(DropView)
+def compile_drop_view(element, compiler, **kw):
+    return f'DROP VIEW IF EXISTS {element.name}'
 
 
 def is_view_model(o):
@@ -38,10 +71,10 @@ def is_view_model(o):
 def install_views(engine):
     import galaxy.model.view
     views = getmembers(galaxy.model.view, is_view_model)
-    for _name, ViewModel in views:
+    for _, view in views:
         # adding DropView here because our unit-testing calls this function when
         # it mocks the app and CreateView will attempt to rebuild an existing
         # view in a database that is already made, the right answer is probably
         # to change the sql that gest emitted when CreateView is rendered.
-        engine.execute(DropView(ViewModel))
-        engine.execute(CreateView(ViewModel))
+        engine.execute(DropView(view.name))
+        engine.execute(CreateView(view.name, view.__view__))
diff --git a/lib/galaxy/objectstore/s3.py b/lib/galaxy/objectstore/s3.py
index 0875f226781..479cb31ba2d 100644
--- a/lib/galaxy/objectstore/s3.py
+++ b/lib/galaxy/objectstore/s3.py
@@ -207,7 +207,11 @@ class S3ObjectStore(ConcreteObjectStore, CloudConfigMixin):
 
     def _configure_connection(self):
         log.debug("Configuring S3 Connection")
-        self.conn = S3Connection(self.access_key, self.secret_key)
+        # If access_key is empty use default credential chain
+        if self.access_key:
+            self.conn = S3Connection(self.access_key, self.secret_key)
+        else:
+            self.conn = S3Connection()
 
     @classmethod
     def parse_xml(clazz, config_xml):
diff --git a/lib/galaxy/objectstore/s3_multipart_upload.py b/lib/galaxy/objectstore/s3_multipart_upload.py
index 075889757a3..88440560028 100644
--- a/lib/galaxy/objectstore/s3_multipart_upload.py
+++ b/lib/galaxy/objectstore/s3_multipart_upload.py
@@ -32,7 +32,10 @@ def mp_from_ids(s3server, mp_id, mp_keyname, mp_bucketname):
                                calling_format=boto.s3.connection.OrdinaryCallingFormat(),
                                path=s3server['conn_path'])
     else:
-        conn = S3Connection(s3server['access_key'], s3server['secret_key'])
+        if s3server['access_key']:
+            conn = S3Connection(s3server['access_key'], s3server['secret_key'])
+        else:
+            conn = S3Connection()
 
     bucket = conn.lookup(mp_bucketname)
     mp = boto.s3.multipart.MultiPartUpload(bucket)
diff --git a/lib/galaxy/selenium/navigation.yml b/lib/galaxy/selenium/navigation.yml
index 3d619456d83..f830b19bbb6 100644
--- a/lib/galaxy/selenium/navigation.yml
+++ b/lib/galaxy/selenium/navigation.yml
@@ -361,6 +361,7 @@ tool_form:
     options: '#options [data-toggle="dropdown"]'
     execute: 'button#execute'
     parameter_div: 'div.ui-form-element[tour_id="${parameter}"]'
+    parameter_textarea: 'div.ui-form-element[tour_id="${parameter}"] textarea'
     reference: '.formatted-reference'
     about: '.tool-footer'
 
@@ -578,12 +579,11 @@ libraries:
     search_field: '#filterInput'
     new_library_name_input: 'input[placeholder="Name"]'
     new_library_description_input: 'input[placeholder="Description"]'
-    add_items_permission_field: '.add_perm > ul input'
-    add_items_permission_field_text:
-      type: xpath
-      selector: '//ul/*/div[contains(text(), "${email}")]'
+    add_items_permission: '.add_library_item_role_list'
+    add_items_permission_input_field: '.add_library_item_role_list input'
+    add_items_permission_field_text: '.add_library_item_role_list .multiselect__tag span'
 
-    add_items_permission_option: '.select2-result-label[role="option"]'
+    add_items_permission_option: '.add_library_item_role_list ul'
 
   folder:
     selectors:
diff --git a/lib/galaxy/structured_app.py b/lib/galaxy/structured_app.py
index 7728929a0ee..1cb49fb8d39 100644
--- a/lib/galaxy/structured_app.py
+++ b/lib/galaxy/structured_app.py
@@ -41,7 +41,43 @@ class BasicApp(Container):
     datatypes_registry: Registry
 
 
-class StructuredApp(BasicApp):
+class MinimalApp(BasicApp):
+    is_webapp: bool  # is_webapp will be set to true when building WSGI app
+    new_installation: bool
+    tag_handler: GalaxyTagHandler
+    model: GalaxyModelMapping
+    install_model: ModelMapping
+    security_agent: GalaxyRBACAgent
+    host_security_agent: HostAgent
+
+
+class MinimalManagerApp(MinimalApp):
+    is_webapp: bool  # is_webapp will be set to true when building WSGI app
+    new_installation: bool
+    tag_handler: GalaxyTagHandler
+    file_sources: ConfiguredFileSources
+    genome_builds: GenomeBuilds
+    model: GalaxyModelMapping
+    install_model: ModelMapping
+    security_agent: GalaxyRBACAgent
+    host_security_agent: HostAgent
+    dataset_collections_service: Any  # 'galaxy.managers.collections.DatasetCollectionManager'
+    history_manager: Any  # 'galaxy.managers.histories.HistoryManager'
+    hda_manager: Any  # 'galaxy.managers.hdas.HDAManager'
+    workflow_manager: Any  # 'galaxy.managers.workflows.WorkflowsManager'
+    workflow_contents_manager: Any  # 'galaxy.managers.workflows.WorkflowContentsManager'
+    library_folder_manager: Any  # 'galaxy.managers.folders.FolderManager'
+    library_manager: Any  # 'galaxy.managers.libraries.LibraryManager'
+    role_manager: Any  # 'galaxy.managers.roles.RoleManager'
+    installed_repository_manager: Any  # 'galaxy.tool_shed.galaxy_install.installed_repository_manager.InstalledRepositoryManager'
+    user_manager: Any
+
+    @property
+    def is_job_handler(self) -> bool:
+        pass
+
+
+class StructuredApp(MinimalManagerApp):
     """Interface defining typed description of the Galaxy UniverseApplication.
 
     Ideally nothing that depends on StructuredApp should require
@@ -92,7 +128,3 @@ class StructuredApp(BasicApp):
     job_manager: Any  # galaxy.jobs.manager.JobManager
     user_manager: Any
     api_keys_manager: Any
-
-    @property
-    def is_job_handler(self) -> bool:
-        pass
diff --git a/lib/galaxy/tool_util/cwl/cwltool_deps.py b/lib/galaxy/tool_util/cwl/cwltool_deps.py
index e90b6225f1c..157f4f4ca25 100644
--- a/lib/galaxy/tool_util/cwl/cwltool_deps.py
+++ b/lib/galaxy/tool_util/cwl/cwltool_deps.py
@@ -52,9 +52,26 @@ except ImportError:
     load_tool = None  # type: ignore
     resolve_and_validate_document = None  # type: ignore
 
+
+def _has_relax_path_checks_flag():
+    """Return True if cwltool uses a flag to control path checks.
+
+    Old cwltool uses the module global below to control whether
+    it's strict about path checks. New versions use an attribute
+    of LoadingContext.
+
+    Once the version of cwltool required is new enough, we can remove
+    this function and simplify the conditionals where it's used.
+    """
+
+    lc = LoadingContext()
+    return hasattr(lc, "relax_path_checks")
+
+
 try:
     from cwltool import command_line_tool
-    command_line_tool.ACCEPTLIST_RE = command_line_tool.ACCEPTLIST_EN_RELAXED_RE
+    if not _has_relax_path_checks_flag():
+        command_line_tool.ACCEPTLIST_RE = command_line_tool.ACCEPTLIST_EN_RELAXED_RE
 except ImportError:
     command_line_tool = None  # type: ignore
 
@@ -63,12 +80,6 @@ try:
 except ImportError:
     resolve_and_validate_document = None  # type: ignore
 
-try:
-    from cwltool import command_line_tool
-    command_line_tool.ACCEPTLIST_RE = command_line_tool.ACCEPTLIST_EN_RELAXED_RE
-except ImportError:
-    command_line_tool = None  # type: ignore
-
 try:
     import shellescape
 except ImportError:
diff --git a/lib/galaxy/tool_util/cwl/schema.py b/lib/galaxy/tool_util/cwl/schema.py
index c91a997d016..2059d016fe7 100644
--- a/lib/galaxy/tool_util/cwl/schema.py
+++ b/lib/galaxy/tool_util/cwl/schema.py
@@ -4,6 +4,7 @@ import tempfile
 from collections import namedtuple
 
 from .cwltool_deps import (
+    _has_relax_path_checks_flag,
     default_loader,
     ensure_cwltool_available,
     load_tool,
@@ -33,6 +34,8 @@ class SchemaLoader:
         loading_context.do_validate = self._validate
         loading_context.loader = self.raw_document_loader
         loading_context.do_update = True
+        if _has_relax_path_checks_flag():
+            loading_context.relax_path_checks = True
         return loading_context
 
     def raw_process_reference(self, path, loading_context=None):
diff --git a/lib/galaxy/tool_util/linters/inputs.py b/lib/galaxy/tool_util/linters/inputs.py
index 1736b976f1d..ff905a1a0df 100644
--- a/lib/galaxy/tool_util/linters/inputs.py
+++ b/lib/galaxy/tool_util/linters/inputs.py
@@ -12,26 +12,22 @@ def lint_inputs(tool_xml, lint_ctx):
     for param in inputs:
         num_inputs += 1
         param_attrib = param.attrib
-        has_errors = False
-        if "type" not in param_attrib:
-            lint_ctx.error("Found param input with no type specified.")
-            has_errors = True
         if "name" not in param_attrib and "argument" not in param_attrib:
             lint_ctx.error("Found param input with no name specified.")
-            has_errors = True
-
-        if has_errors:
             continue
-
-        param_type = param_attrib["type"]
         param_name = _parse_name(param_attrib.get("name"), param_attrib.get("argument"))
 
+        if "type" not in param_attrib:
+            lint_ctx.error(f"Param input [{param_name}] input with no type specified.")
+            continue
+        param_type = param_attrib["type"]
+
         if not is_valid_cheetah_placeholder(param_name):
-            lint_ctx.warn("Param input [%s] is not a valid Cheetah placeholder.", param_name)
+            lint_ctx.warn(f"Param input [{param_name}] is not a valid Cheetah placeholder.")
 
         if param_type == "data":
             if "format" not in param_attrib:
-                lint_ctx.warn("Param input [%s] with no format specified - 'data' format will be assumed.", param_name)
+                lint_ctx.warn(f"Param input [{param_name}] with no format specified - 'data' format will be assumed.")
         elif param_type == "select":
             dynamic_options = param.get("dynamic_options", None)
             if dynamic_options is None:
@@ -39,17 +35,20 @@ def lint_inputs(tool_xml, lint_ctx):
 
             select_options = param.findall('./option')
             if any(['value' not in option.attrib for option in select_options]):
-                lint_ctx.error("Select [%s] has option without value", param_name)
+                lint_ctx.error(f"Select [{param_name}] has option without value")
+            if len(set([option.text.strip() for option in select_options])) != len(select_options):
+                lint_ctx.error(f"Select [{param_name}] has multiple options with the same text content")
+            if len(set([option.attrib.get("value") for option in select_options])) != len(select_options):
+                lint_ctx.error(f"Select [{param_name}] has multiple options with the same value")
 
             if dynamic_options is None and len(select_options) == 0:
-                message = "No options defined for select [%s]" % param_name
-                lint_ctx.warn(message)
+                lint_ctx.warn(f"No options defined for select [{param_name}]")
 
             if param_attrib.get("display") == "radio":
                 if string_as_bool(param_attrib.get("multiple", "false")):
-                    lint_ctx.error('Select [%s] display="radio" is incompatible with multiple="true"', param_name)
+                    lint_ctx.error(f'Select [{param_name}] display="radio" is incompatible with multiple="true"')
                 if string_as_bool(param_attrib.get("optional", "false")):
-                    lint_ctx.error('Select [%s] display="radio" is incompatible with optional="true"', param_name)
+                    lint_ctx.error(f'Select [{param_name}] display="radio" is incompatible with optional="true"')
         # TODO: Validate type, much more...
 
     conditional_selects = tool_xml.findall("./inputs//conditional")
@@ -62,11 +61,11 @@ def lint_inputs(tool_xml, lint_ctx):
             continue
         first_param = conditional.find("param")
         if first_param is None:
-            lint_ctx.error("Conditional '%s' has no child <param>" % conditional_name)
+            lint_ctx.error(f"Conditional [{conditional_name}] has no child <param>")
             continue
         first_param_type = first_param.get('type')
         if first_param_type not in ['select', 'boolean']:
-            lint_ctx.warn("Conditional '%s' first param should have type=\"select\" /> or type=\"boolean\"" % conditional_name)
+            lint_ctx.warn(f'Conditional [{conditional_name}] first param should have type="select" /> or type="boolean"')
             continue
 
         if first_param_type == 'select':
@@ -79,32 +78,32 @@ def lint_inputs(tool_xml, lint_ctx):
             ]
 
         if string_as_bool(first_param.get('optional', False)):
-            lint_ctx.warn("Conditional test parameter cannot be optional")
+            lint_ctx.warn(f"Conditional [{conditional_name}] test parameter cannot be optional")
 
         whens = conditional.findall('./when')
         if any('value' not in when.attrib for when in whens):
-            lint_ctx.error("When without value")
+            lint_ctx.error(f"Conditional [{conditional_name}] when without value")
 
         when_ids = [w.get('value') for w in whens]
 
         for option_id in option_ids:
             if option_id not in when_ids:
-                lint_ctx.warn(f"No <when /> block found for {first_param_type} option '{option_id}' inside conditional '{conditional_name}'")
+                lint_ctx.warn(f"Conditional [{conditional_name}] no <when /> block found for {first_param_type} option '{option_id}'")
 
         for when_id in when_ids:
             if when_id not in option_ids:
                 if first_param_type == 'select':
-                    lint_ctx.warn(f"No <option /> found for when block '{when_id}' inside conditional '{conditional_name}'")
+                    lint_ctx.warn(f"Conditional [{conditional_name}] no <option /> found for when block '{when_id}'")
                 else:
-                    lint_ctx.warn(f"No truevalue/falsevalue found for when block '{when_id}' inside conditional '{conditional_name}'")
+                    lint_ctx.warn(f"Conditional [{conditional_name}] no truevalue/falsevalue found for when block '{when_id}'")
 
     if datasource:
         for datasource_tag in ('display', 'uihints'):
             if not any([param.tag == datasource_tag for param in inputs]):
-                lint_ctx.info("%s tag usually present in data sources" % datasource_tag)
+                lint_ctx.info(f"{datasource_tag} tag usually present in data sources")
 
     if num_inputs:
-        lint_ctx.info("Found %d input parameters.", num_inputs)
+        lint_ctx.info(f"Found {num_inputs} input parameters.")
     else:
         if datasource:
             lint_ctx.info("No input parameters, OK for data sources")
diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py
index b8686c7d097..c966460b462 100644
--- a/lib/galaxy/tool_util/verify/interactor.py
+++ b/lib/galaxy/tool_util/verify/interactor.py
@@ -780,7 +780,7 @@ def verify_collection(output_collection_def, data_collection, verify_dataset):
     if expected_collection_type:
         collection_type = data_collection["collection_type"]
         if expected_collection_type != collection_type:
-            template = "Expected output collection [%s] to be of type [%s], was of type [%s]."
+            template = "Output collection '%s': expected to be of type [%s], was of type [%s]."
             message = template % (name, expected_collection_type, collection_type)
             raise AssertionError(message)
 
@@ -788,7 +788,7 @@ def verify_collection(output_collection_def, data_collection, verify_dataset):
     if expected_element_count:
         actual_element_count = len(data_collection["elements"])
         if expected_element_count != actual_element_count:
-            template = "Expected output collection [%s] to have %s elements, but it had %s."
+            template = "Output collection '%s': expected to have %s elements, but it had %s."
             message = template % (name, expected_element_count, actual_element_count)
             raise AssertionError(message)
 
@@ -813,7 +813,7 @@ def verify_collection(output_collection_def, data_collection, verify_dataset):
 
             element = get_element(element_objects, element_identifier)
             if not element:
-                template = "Failed to find identifier '%s' in the tool generated collection elements %s"
+                template = "Output collection '%s': failed to find identifier '%s' in the tool generated elements %s"
                 message = template % (element_identifier, eo_ids)
                 raise AssertionError(message)
 
@@ -835,8 +835,8 @@ def verify_collection(output_collection_def, data_collection, verify_dataset):
                         break
                     i += 1
                 if element is None:
-                    template = "Collection identifier '%s' found out of order, expected order of %s for the tool generated collection elements %s"
-                    message = template % (element_identifier, expected_sort_order, eo_ids)
+                    template = "Output collection '%s': identifier '%s' found out of order, expected order of %s for the tool generated collection elements %s"
+                    message = template % (name, element_identifier, expected_sort_order, eo_ids)
                     raise AssertionError(message)
 
     verify_elements(data_collection["elements"], output_collection_def.element_tests)
diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index a3963d845aa..86e696ef871 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -724,8 +724,8 @@ input dataset.
 <param name="field_name" type="select" label="Field name" refresh_on_change="true">
     <options>
         <filter type="data_meta" ref="input" key="field_names"/>
-        <validator type="no_options" message="The selected shape has no uncolored surface fields." />
     </options>
+    <validator type="no_options" message="The selected shape has no uncolored surface fields." />
 </param>
 ```
 
@@ -2204,8 +2204,8 @@ the [Bowtie 2](https://github.com/galaxyproject/tools-iuc/blob/master/tools/bowt
     <param name="index" type="select" label="Select reference genome" help="If your genome of interest is not listed, contact the Galaxy team">
       <options from_data_table="bowtie2_indexes">
         <filter type="sort_by" column="2"/>
-        <validator type="no_options" message="No indexes are available for the selected input dataset"/>
       </options>
+      <validator type="no_options" message="No indexes are available for the selected input dataset"/>
     </param>
   </when>
   <when value="history">
@@ -3385,8 +3385,8 @@ alternative to local reference data.
     <param name="index" type="select" label="Select reference genome" help="If your genome of interest is not listed, contact the Galaxy team">
       <options from_data_table="bowtie2_indexes">
         <filter type="sort_by" column="2"/>
-        <validator type="no_options" message="No indexes are available for the selected input dataset"/>
       </options>
+      <validator type="no_options" message="No indexes are available for the selected input dataset"/>
     </param>
   </when>
   <when value="history">
@@ -4039,8 +4039,8 @@ tool demonstrates filtering values from a tool data table.
 <param help="If your genome of interest is not listed, contact the Galaxy team" label="Select a reference genome" name="index" type="select">
     <options from_data_table="hisat2_indexes">
         <filter column="2" type="sort_by" />
-        <validator message="No genomes are available for the selected input dataset" type="no_options" />
     </options>
+    <validator message="No genomes are available for the selected input dataset" type="no_options" />
 </param>
 ```
 
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 26a9e2f46d7..058cfb901c8 100644
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -1360,7 +1360,7 @@ class Tool(Dictifiable):
     def populate_resource_parameters(self, tool_source):
         root = getattr(tool_source, 'root', None)
         if root is not None and hasattr(self.app, 'job_config') and hasattr(self.app.job_config, 'get_tool_resource_xml'):
-            resource_xml = self.app.job_config.get_tool_resource_xml(root.get('id'), self.tool_type)
+            resource_xml = self.app.job_config.get_tool_resource_xml(root.get('id', '').lower(), self.tool_type)
             if resource_xml is not None:
                 inputs = root.find('inputs')
                 if inputs is None:
@@ -1936,6 +1936,7 @@ class Tool(Dictifiable):
             input_dbkey,
             object_store=tool.app.object_store,
             final_job_state=final_job_state,
+            flush_per_n_datasets=tool.app.config.flush_per_n_datasets,
         )
         collected = output_collect.collect_primary_datasets(
             job_context,
diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py
index 4adfbdf01a4..977a9da76e9 100644
--- a/lib/galaxy/tools/actions/__init__.py
+++ b/lib/galaxy/tools/actions/__init__.py
@@ -975,6 +975,13 @@ def determine_output_format(output, parameter_context, input_datasets, input_dat
     # the type should match the input
     ext = output.format
     if ext == "input":
+        if input_datasets and random_input_ext in {'data', 'auto'}:
+            # Probably dealing with an implicitly converted dataset
+            try:
+                first_input_dataset = next(iter(input_datasets.values()))
+                random_input_ext = get_ext_or_implicit_ext(first_input_dataset)
+            except Exception:
+                pass
         ext = random_input_ext
     format_source = output.format_source
     if format_source is not None and format_source in input_datasets:
diff --git a/lib/galaxy/tools/cache.py b/lib/galaxy/tools/cache.py
index 94e0b6d2996..351e654ba67 100644
--- a/lib/galaxy/tools/cache.py
+++ b/lib/galaxy/tools/cache.py
@@ -16,7 +16,7 @@ from sqlalchemy.orm import (
 from sqlitedict import SqliteDict
 
 from galaxy.model.tool_shed_install import ToolShedRepository
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.tools.toolbox.base import ToolConfRepository
 from galaxy.util import unicodify
 from galaxy.util.hash_util import md5_hash_file
@@ -286,7 +286,7 @@ class ToolShedRepositoryCache:
     repositories: List[ToolShedRepository]
     repos_by_tuple: Dict[Tuple[str, str, str], List[ToolConfRepository]]
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
         # Contains ToolConfRepository objects created from shed_tool_conf.xml entries
         self.local_repositories = []
diff --git a/lib/galaxy/tools/data/__init__.py b/lib/galaxy/tools/data/__init__.py
index b0f65955ff0..c3b922f2c48 100644
--- a/lib/galaxy/tools/data/__init__.py
+++ b/lib/galaxy/tools/data/__init__.py
@@ -893,7 +893,11 @@ class RefgenieToolDataTable(TabularToolDataTable):
         return rval
 
     def _remove_entry(self, values):
-        raise NotImplementedError("Not supported")
+
+        log.warning("Deletion from refgenie-backed '%s' data table is not supported, will only try to delete from .loc files", self.name)
+
+        # Update every non-refgenie files
+        super()._remove_entry(values)
 
 
 def expand_here_template(content, here=None):
diff --git a/lib/galaxy/tools/data_manager/manager.py b/lib/galaxy/tools/data_manager/manager.py
index 4805f1320ab..dd823b2e925 100644
--- a/lib/galaxy/tools/data_manager/manager.py
+++ b/lib/galaxy/tools/data_manager/manager.py
@@ -5,7 +5,7 @@ import os
 from typing import Dict
 
 from galaxy import util
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.tools.data import TabularToolDataTable
 from galaxy.util.template import fill_template
 
@@ -20,7 +20,7 @@ class DataManagers:
     data_managers: Dict[str, 'DataManager']
     managed_data_tables: Dict[str, 'DataManager']
 
-    def __init__(self, app: StructuredApp, xml_filename=None):
+    def __init__(self, app: MinimalManagerApp, xml_filename=None):
         self.app = app
         self.data_managers = {}
         self.managed_data_tables = {}
diff --git a/lib/galaxy/tools/execute.py b/lib/galaxy/tools/execute.py
index 9200bcfcdaf..48ac8c23884 100644
--- a/lib/galaxy/tools/execute.py
+++ b/lib/galaxy/tools/execute.py
@@ -72,6 +72,12 @@ def execute(trans, tool, mapping_params, history, rerun_remap_job_id=None, colle
         if job:
             log.debug(job_timer.to_str(tool_id=tool.id, job_id=job.id))
             execution_tracker.record_success(execution_slice, job, result)
+            # associate dataset instances with the job that creates them
+            if result:
+                instance_types = (model.HistoryDatasetAssociation, model.LibraryDatasetDatasetAssociation)
+                datasets = [pair[1] for pair in result if type(pair[1]) in instance_types]
+                if datasets:
+                    job_datasets[job] = datasets
         else:
             execution_tracker.record_error(result)
 
@@ -94,6 +100,7 @@ def execute(trans, tool, mapping_params, history, rerun_remap_job_id=None, colle
     jobs_executed = 0
     has_remaining_jobs = False
     execution_slice = None
+    job_datasets = {}  # job: list of dataset instances created by job
 
     for i, execution_slice in enumerate(execution_tracker.new_execution_slices()):
         if max_num_jobs is not None and jobs_executed >= max_num_jobs:
@@ -110,6 +117,12 @@ def execute(trans, tool, mapping_params, history, rerun_remap_job_id=None, colle
     else:
         # Make sure collections, implicit jobs etc are flushed even if there are no precreated output datasets
         trans.sa_session.flush()
+
+    if job_datasets:
+        for job, datasets in job_datasets.items():
+            for dataset_instance in datasets:
+                dataset_instance.dataset.job = job
+
     tool_id = tool.id
     for job in execution_tracker.successful_jobs:
         # Put the job in the queue if tracking in memory
diff --git a/lib/galaxy/tools/parameters/__init__.py b/lib/galaxy/tools/parameters/__init__.py
index 9de2ce9da6e..d01a61cf884 100644
--- a/lib/galaxy/tools/parameters/__init__.py
+++ b/lib/galaxy/tools/parameters/__init__.py
@@ -9,7 +9,14 @@ from boltons.iterutils import remap
 from galaxy.util import unicodify
 from galaxy.util.expressions import ExpressionContext
 from galaxy.util.json import safe_loads
-from .basic import DataCollectionToolParameter, DataToolParameter, is_runtime_value, runtime_to_json, SelectToolParameter
+from .basic import (
+    DataCollectionToolParameter,
+    DataToolParameter,
+    is_runtime_value,
+    ParameterValueError,
+    runtime_to_json,
+    SelectToolParameter,
+)
 from .grouping import Conditional, Repeat, Section, UploadDataset
 
 REPLACE_ON_TRUTHY = object()
@@ -229,7 +236,10 @@ def params_from_strings(params, param_values, app, ignore_errors=False):
             # This would resolve a lot of back and forth in the various to/from methods.
             value = safe_loads(value)
         if param:
-            value = param.value_from_basic(value, app, ignore_errors)
+            try:
+                value = param.value_from_basic(value, app, ignore_errors)
+            except ParameterValueError:
+                continue
         rval[key] = value
     return rval
 
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index e56e827b272..f7869a88faa 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -212,6 +212,8 @@ class ToolParameter(Dictifiable):
     def value_from_basic(self, value, app, ignore_errors=False):
         # Handle Runtime and Unvalidated values
         if is_runtime_value(value):
+            if isinstance(self, HiddenToolParameter):
+                raise ParameterValueError(message_suffix='Runtime Parameter not valid', parameter_name=self.name)
             return runtime_to_object(value)
         elif isinstance(value, dict) and value.get('__class__') == 'UnvalidatedValue':
             return value['value']
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
index 91639a96c33..727fe05f38c 100644
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -7,6 +7,7 @@ import binascii
 import collections
 import errno
 import importlib
+import itertools
 import json
 import os
 import random
@@ -20,6 +21,7 @@ import tempfile
 import textwrap
 import threading
 import time
+import typing
 import unicodedata
 import xml.dom.minidom
 from datetime import datetime
@@ -212,6 +214,21 @@ def file_reader(fp, chunk_size=CHUNK_SIZE):
     fp.close()
 
 
+def chunk_iterable(it: typing.Iterable, size: int = 1000):
+    """
+    Break an iterable into chunks of ``size`` elements.
+
+    >>> list(chunk_iterable([1, 2, 3, 4, 5, 6, 7], 3))
+    [(1, 2, 3), (4, 5, 6), (7,)]
+    """
+    it = iter(it)
+    while True:
+        p = tuple(itertools.islice(it, size))
+        if not p:
+            break
+        yield p
+
+
 def unique_id(KEY_SIZE=128):
     """
     Generates an unique id
diff --git a/lib/galaxy/util/bool_expressions.py b/lib/galaxy/util/bool_expressions.py
new file mode 100644
index 00000000000..cd93cb2ec89
--- /dev/null
+++ b/lib/galaxy/util/bool_expressions.py
@@ -0,0 +1,187 @@
+"""Simple boolean expression parser and evaluator using pyparsing.
+
+Based on the example: https://github.com/pyparsing/pyparsing/blob/master/examples/simpleBool.py
+"""
+
+import logging
+from typing import (
+    Callable,
+    Iterable,
+    Optional,
+    Set,
+)
+
+from pyparsing import (
+    alphanums,
+    CaselessKeyword,
+    Forward,
+    infixNotation,
+    Keyword,
+    opAssoc,
+    ParseException,
+    ParserElement,
+    Word,
+)
+
+log = logging.getLogger(__name__)
+
+ParserElement.enablePackrat()
+
+# Defines the allowed characters that form a valid token.
+# Tokens that don't match this format will raise an exception when found.
+DEFAULT_TOKEN_FORMAT = alphanums + "_-@."
+
+TRUE = Keyword("True")
+FALSE = Keyword("False")
+NOT_OP = CaselessKeyword("not")
+AND_OP = CaselessKeyword("and")
+OR_OP = CaselessKeyword("or")
+
+
+class TokenEvaluator:
+    """Interface to evaluate a token and determine its boolean value."""
+
+    def evaluate(self, token: str) -> bool:
+        """Returns the boolean representation of the given token according to some custom logic."""
+        raise NotImplementedError
+
+
+class BoolOperand:
+    """Represents a boolean operand that has a label and a value.
+
+    The value is determined by a custom TokenEvaluator."""
+    evaluator: TokenEvaluator
+
+    def __init__(self, token):
+        self.label = token[0]
+        self.value = self.evaluator.evaluate(token[0])
+
+    def __bool__(self):
+        return self.value
+
+    def __str__(self):
+        return self.label
+
+    __repr__ = __str__
+
+
+class BoolBinaryOperation:
+    """Base representation of a boolean binary operation."""
+    reprsymbol: str
+    evalop: Callable[[Iterable[object]], bool]
+
+    def __init__(self, token):
+        self.args = token[0][0::2]
+
+    def __str__(self):
+        sep = f" {self.reprsymbol} "
+        return f"({sep.join(map(str, self.args))})"
+
+    def __bool__(self):
+        return self.evalop(bool(a) for a in self.args)
+
+    __nonzero__ = __bool__
+
+
+class BoolAnd(BoolBinaryOperation):
+    """Represents the `AND` boolean operation."""
+    reprsymbol = "&"
+    evalop = all
+
+
+class BoolOr(BoolBinaryOperation):
+    """Represents the `OR` boolean operation."""
+    reprsymbol = "|"
+    evalop = any
+
+
+class BoolNot:
+    """Represents the `NOT` boolean operation."""
+
+    def __init__(self, token):
+        self.arg = token[0][1]
+
+    def __bool__(self):
+        v = bool(self.arg)
+        return not v
+
+    def __str__(self):
+        return f"~{self.arg}"
+
+    __repr__ = __str__
+
+
+class BooleanExpressionEvaluator:
+    """Boolean logic parser that can evaluate an expression using a particular TokenEvaluator.
+
+    Supports AND, OR and NOT operator including parentheses to override operator precedences.
+
+    You can pass in different TokenEvaluator implementations to customize how the tokens (or variables) are
+    converted to a boolean value when evaluating the expression."""
+
+    def __init__(self, evaluator: TokenEvaluator, token_format: Optional[str] = None) -> None:
+        """Initializes the expression evaluator.
+
+        :param evaluator: The custom TokenEvaluator used to transform any token into a boolean.
+        :type evaluator:  TokenEvaluator
+        :param token_format: A string of all allowed characters used to form a valid token, defaults to None.
+                             The default value (None) will use DEFAULT_TOKEN_FORMAT which means the allowed characters are [A-Za-z0-9_-@.].
+        :type token_format:  Optional[str]
+        """
+        action = BoolOperand
+        action.evaluator = evaluator
+        boolOperand = TRUE | FALSE | Word(token_format or DEFAULT_TOKEN_FORMAT)
+        boolOperand.setParseAction(action)
+        self.boolExpr: Forward = infixNotation(
+            boolOperand,
+            [
+                (NOT_OP, 1, opAssoc.RIGHT, BoolNot),
+                (AND_OP, 2, opAssoc.LEFT, BoolAnd),
+                (OR_OP, 2, opAssoc.LEFT, BoolOr),
+            ],
+        )
+
+    def evaluate_expression(self, expr: str) -> bool:
+        """Given an expression it gets evaluated to True or False using boolean logic."""
+        try:
+            res = self.boolExpr.parseString(expr, parseAll=True)[0]
+            return bool(res)
+        except ParseException as e:
+            log.error(f'BooleanExpressionEvaluator unable to evaluate expression => {expr}', exc_info=e)
+            raise e
+
+    @classmethod
+    def is_valid_expression(cls, expr: str) -> bool:
+        """Tries to evaluate the given boolean expression and returns True if it is valid or
+        False if it has syntax or gramatical errors."""
+        try:
+            evaluator = BooleanExpressionEvaluator(ValidationOnlyTokenEvaluator())
+            evaluator.evaluate_expression(expr)
+            return True
+        except ParseException:
+            return False
+
+
+class TokenContainedEvaluator(TokenEvaluator):
+    """Implements the TokenEvaluator interface to determine if a token is contained
+    in a particular list of tokens."""
+
+    def __init__(self, tokens: Set[str]) -> None:
+        """Initializes the token evaluator with the set of tokens that will evaluate to `True`.
+
+        :param tokens: The list of tokens that should be evaluated to True.
+        :type tokens: List[str]
+        """
+        self.tokens = tokens
+
+    def evaluate(self, token: str) -> bool:
+        return token in self.tokens
+
+
+class ValidationOnlyTokenEvaluator(TokenEvaluator):
+    """Simple TokenEvaluator that always evaluates to True for valid tokens.
+
+    This is only useful for validation purposes, do NOT use it for real expression evaluations."""
+
+    def evaluate(self, token: str) -> bool:
+        return True
diff --git a/lib/galaxy/util/checkers.py b/lib/galaxy/util/checkers.py
index 140c53ac75b..ae049943397 100644
--- a/lib/galaxy/util/checkers.py
+++ b/lib/galaxy/util/checkers.py
@@ -1,5 +1,6 @@
 import bz2
 import gzip
+import os
 import re
 import tarfile
 import zipfile
@@ -49,10 +50,24 @@ def check_binary(name, file_path=True):
     # Handles files if file_path is True or text if file_path is False
     if file_path:
         temp = open(name, "rb")
+        size = os.stat(name).st_size
     else:
         temp = BytesIO(name)
+        size = len(name)
+    read_start = int(size / 2)
+    read_length = 1024
     try:
-        return util.is_binary(temp.read(1024))
+        if util.is_binary(temp.read(read_length)):
+            return True
+        # Some binary files have text only within the first 1024
+        # Read 1024 from the middle of the file if this is not
+        # a gzip or zip compressed file (bzip are indexed),
+        # to avoid issues with long txt headers on binary files.
+        if file_path and not is_gzip(name) and not is_zip(name) and not is_bz2(name):
+            # file_path=False doesn't seem to be used in the codebase
+            temp.seek(read_start)
+            return util.is_binary(temp.read(read_length))
+        return False
     finally:
         temp.close()
 
diff --git a/lib/galaxy/visualization/genomes.py b/lib/galaxy/visualization/genomes.py
index 1737b9e1802..3869a5178ec 100644
--- a/lib/galaxy/visualization/genomes.py
+++ b/lib/galaxy/visualization/genomes.py
@@ -11,7 +11,7 @@ from galaxy.exceptions import (
     ObjectNotFound,
     ReferenceDataError,
 )
-from galaxy.structured_app import StructuredApp
+from galaxy.structured_app import MinimalManagerApp
 from galaxy.util.bunch import Bunch
 
 log = logging.getLogger(__name__)
@@ -197,7 +197,7 @@ class Genomes:
     Provides information about available genome data and methods for manipulating that data.
     """
 
-    def __init__(self, app: StructuredApp):
+    def __init__(self, app: MinimalManagerApp):
         self.app = app
         # Create list of genomes from app.genome_builds
         self.genomes: Dict[str, Genome] = {}
diff --git a/lib/galaxy/webapps/base/controller.py b/lib/galaxy/webapps/base/controller.py
index 0f25cabb406..13a2be6c2df 100644
--- a/lib/galaxy/webapps/base/controller.py
+++ b/lib/galaxy/webapps/base/controller.py
@@ -26,6 +26,7 @@ from galaxy.managers import (
     users,
     workflows
 )
+from galaxy.managers.sharable import SlugBuilder
 from galaxy.model import (
     ExtendedMetadata,
     ExtendedMetadataIndex,
@@ -449,15 +450,6 @@ class ImportsHistoryMixin:
         return job
 
 
-class UsesLibraryMixin:
-
-    def get_library(self, trans, id, check_ownership=False, check_accessible=True):
-        library = self.get_object(trans, id, 'Library')
-        if check_accessible and not (trans.user_is_admin or trans.app.security_agent.can_access_library(trans.get_current_user_roles(), library)):
-            error("Library is not accessible to the current user")
-        return library
-
-
 class UsesLibraryMixinItems(SharableItemSecurityMixin):
 
     def get_library_folder(self, trans, id, check_ownership=False, check_accessible=True):
@@ -648,6 +640,7 @@ class UsesVisualizationMixin(UsesLibraryMixinItems):
     """
     Mixin for controllers that use Visualization objects.
     """
+    slug_builder = SlugBuilder()
 
     def get_visualization(self, trans, id, check_ownership=True, check_accessible=False):
         """
@@ -1139,7 +1132,7 @@ class UsesVisualizationMixin(UsesLibraryMixinItems):
         if slug:
             visualization.slug = slug
         else:
-            self.create_item_slug(trans.sa_session, visualization)
+            self.slug_builder.create_item_slug(trans.sa_session, visualization)
         if annotation:
             annotation = sanitize_html(annotation)
             # TODO: if this is to stay in the mixin, UsesAnnotations should be added to the superclasses
@@ -1212,6 +1205,7 @@ class UsesVisualizationMixin(UsesLibraryMixinItems):
 
 class UsesStoredWorkflowMixin(SharableItemSecurityMixin, UsesAnnotations):
     """ Mixin for controllers that use StoredWorkflow objects. """
+    slug_builder = SlugBuilder()
 
     def get_stored_workflow(self, trans, id, check_ownership=True, check_accessible=False):
         """ Get a StoredWorkflow from the database by id, verifying ownership. """
@@ -1226,7 +1220,7 @@ class UsesStoredWorkflowMixin(SharableItemSecurityMixin, UsesAnnotations):
 
             # Older workflows may be missing slugs, so set them here.
             if not workflow.slug:
-                self.create_item_slug(trans.sa_session, workflow)
+                self.slug_builder.create_item_slug(trans.sa_session, workflow)
                 trans.sa_session.flush()
 
         return workflow
@@ -1249,6 +1243,7 @@ class UsesStoredWorkflowMixin(SharableItemSecurityMixin, UsesAnnotations):
         workflow.stored_workflow = imported_stored
         imported_stored.latest_workflow = workflow
         imported_stored.user = trans.user
+        imported_stored.copy_tags_from(stored.user, stored)
         # Save new workflow.
         session = trans.sa_session
         session.add(imported_stored)
@@ -1346,6 +1341,7 @@ class SharableMixin:
 
     manager: Any = None
     serializer: Any = None
+    slug_builder = SlugBuilder()
 
     # -- Implemented methods. --
 
@@ -1370,112 +1366,7 @@ class SharableMixin:
             Does not flush/commit changes, however. Item must have name, user,
             importable, and slug attributes. """
         item.importable = True
-        self.create_item_slug(sa_session, item)
-
-    def create_item_slug(self, sa_session, item):
-        """ Create/set item slug. Slug is unique among user's importable items
-            for item's class. Returns true if item's slug was set/changed; false
-            otherwise.
-        """
-        cur_slug = item.slug
-
-        # Setup slug base.
-        if cur_slug is None or cur_slug == "":
-            # Item can have either a name or a title.
-            if hasattr(item, 'name'):
-                item_name = item.name
-            elif hasattr(item, 'title'):
-                item_name = item.title
-            slug_base = util.ready_name_for_url(item_name.lower())
-        else:
-            slug_base = cur_slug
-
-        # Using slug base, find a slug that is not taken. If slug is taken,
-        # add integer to end.
-        new_slug = slug_base
-        count = 1
-        # Ensure unique across model class and user and don't include this item
-        # in the check in case it has previously been assigned a valid slug.
-        while sa_session.query(item.__class__).filter(item.__class__.user == item.user, item.__class__.slug == new_slug, item.__class__.id != item.id).count() != 0:
-            # Slug taken; choose a new slug based on count. This approach can
-            # handle numerous items with the same name gracefully.
-            new_slug = '%s-%i' % (slug_base, count)
-            count += 1
-
-        # Set slug and return.
-        item.slug = new_slug
-        return item.slug == cur_slug
-
-    @web.legacy_expose_api
-    def sharing(self, trans, id, payload=None, **kwd):
-        skipped = False
-        class_name = self.manager.model_class.__name__
-        item = self.get_object(trans, id, class_name, check_ownership=True, check_accessible=True, deleted=False)
-        actions = []
-        if payload:
-            actions += payload.get("action").split("-")
-        for action in actions:
-            if action == "make_accessible_via_link":
-                self._make_item_accessible(trans.sa_session, item)
-                if hasattr(item, "has_possible_members") and item.has_possible_members:
-                    skipped = self._make_members_public(trans, item)
-            elif action == "make_accessible_and_publish":
-                self._make_item_accessible(trans.sa_session, item)
-                if hasattr(item, "has_possible_members") and item.has_possible_members:
-                    skipped = self._make_members_public(trans, item)
-                item.published = True
-            elif action == "publish":
-                if item.importable:
-                    item.published = True
-                    if hasattr(item, "has_possible_members") and item.has_possible_members:
-                        skipped = self._make_members_public(trans, item)
-                else:
-                    raise exceptions.MessageException("%s not importable." % class_name)
-            elif action == "disable_link_access":
-                item.importable = False
-            elif action == "unpublish":
-                item.published = False
-            elif action == "disable_link_access_and_unpublish":
-                item.importable = item.published = False
-            elif action == "unshare_user":
-                user = trans.sa_session.query(trans.app.model.User).get(self.decode_id(payload.get("user_id")))
-                class_name_lc = class_name.lower()
-                ShareAssociation = getattr(trans.app.model, "%sUserShareAssociation" % class_name)
-                usas = trans.sa_session.query(ShareAssociation).filter_by(**{"user": user, class_name_lc: item}).all()
-                if not usas:
-                    raise exceptions.MessageException("%s was not shared with user." % class_name)
-                for usa in usas:
-                    trans.sa_session.delete(usa)
-            trans.sa_session.add(item)
-            trans.sa_session.flush()
-        if item.importable and not item.slug:
-            self._make_item_accessible(trans.sa_session, item)
-        item_dict = self.serializer.serialize_to_view(item,
-            user=trans.user, trans=trans, default_view="sharing")
-        item_dict["users_shared_with"] = [{"id": self.app.security.encode_id(a.user.id), "email": a.user.email} for a in item.users_shared_with]
-        if skipped:
-            item_dict["skipped"] = True
-        return item_dict
-
-    def _make_members_public(self, trans, item):
-        """ Make the non-purged datasets in history public
-        Performs pemissions check.
-        """
-        # TODO eventually we should handle more classes than just History
-        skipped = False
-        for hda in item.activatable_datasets:
-            dataset = hda.dataset
-            if not trans.app.security_agent.dataset_is_public(dataset):
-                if trans.app.security_agent.can_manage_dataset(trans.user.all_roles(), dataset):
-                    try:
-                        trans.app.security_agent.make_dataset_public(hda.dataset)
-                    except Exception:
-                        log.warning("Unable to make dataset with id: %s public", dataset.id)
-                        skipped = True
-                else:
-                    log.warning("User without permissions tried to make dataset with id: %s public", dataset.id)
-                    skipped = True
-        return skipped
+        self.slug_builder.create_item_slug(sa_session, item)
 
     # -- Abstract methods. --
 
diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py
index 5e59db65f74..e91ff13bc83 100644
--- a/lib/galaxy/webapps/base/webapp.py
+++ b/lib/galaxy/webapps/base/webapp.py
@@ -16,7 +16,6 @@ import mako.lookup
 import mako.runtime
 from babel import Locale
 from babel.support import Translations
-from Cheetah.Template import Template
 from sqlalchemy import and_, true
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -939,12 +938,8 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo
         # call get_user so we can invalidate sessions from external users,
         # if external auth has been disabled.
         self.get_user()
-        if filename.endswith(".mako"):
-            return self.fill_template_mako(filename, **kwargs)
-        else:
-            template = Template(file=os.path.join(self.app.config.template_path, filename),
-                                searchList=[kwargs, self.template_context, dict(caller=self, t=self, h=helpers, util=util, request=self.request, response=self.response, app=self.app)])
-            return str(template)
+        assert filename.endswith(".mako")
+        return self.fill_template_mako(filename, **kwargs)
 
     def fill_template_mako(self, filename, template_lookup=None, **kwargs):
         template_lookup = template_lookup or self.webapp.mako_template_lookup
@@ -973,14 +968,6 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo
             return []
         return render
 
-    def fill_template_string(self, template_string, context=None, **kwargs):
-        """
-        Fill in a template, putting any keyword arguments on the context.
-        """
-        template = Template(source=template_string,
-                            searchList=[context or kwargs, dict(caller=self)])
-        return str(template)
-
 
 def default_url_path(path):
     return os.path.abspath(os.path.join(os.path.dirname(__file__), path))
diff --git a/lib/galaxy/webapps/galaxy/api/folder_contents.py b/lib/galaxy/webapps/galaxy/api/folder_contents.py
index bbdae1236d1..0fff9bb3c79 100644
--- a/lib/galaxy/webapps/galaxy/api/folder_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/folder_contents.py
@@ -7,25 +7,354 @@ from galaxy import (
     exceptions,
     util
 )
+from galaxy.managers import base as managers_base
 from galaxy.managers.folders import FolderManager
 from galaxy.managers.hdas import HDAManager
 from galaxy.model import tags
+from galaxy.structured_app import StructuredApp
 from galaxy.web import (
     expose_api,
     expose_api_anonymous
 )
-from galaxy.webapps.base.controller import UsesLibraryMixin, UsesLibraryMixinItems
+from galaxy.webapps.base.controller import UsesLibraryMixinItems
 from . import BaseGalaxyAPIController, depends
 
 log = logging.getLogger(__name__)
 
+TIME_FORMAT = "%Y-%m-%d %I:%M %p"
+FOLDER_TYPE_NAME = "folder"
+FILE_TYPE_NAME = "file"
 
-class FolderContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMixinItems):
+
+class FolderContentsAPIView(UsesLibraryMixinItems):
+    """
+    Interface/service object for interacting with folders contents providing a shared view for API controllers.
+    """
+
+    def __init__(self, app: StructuredApp, hda_manager: HDAManager, folder_manager: FolderManager):
+        self.app = app
+        self.hda_manager = hda_manager
+        self.folder_manager = folder_manager
+
+    def get_object(self, trans, id, class_name, check_ownership=False, check_accessible=False, deleted=None):
+        """
+        Convenience method to get a model object with the specified checks.
+        """
+        return managers_base.get_object(trans, id, class_name, check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted)
+
+    def index(self, trans, folder_id, limit=None, offset=None, search_text=None, include_deleted=False):
+        """
+        Displays a collection (list) of a folder's contents (files and folders). Encoded folder ID is prepended
+        with 'F' if it is a folder as opposed to a data set which does not have it. Full path is provided in
+        response as a separate object providing data for breadcrumb path building.
+
+        ..example:
+            limit and offset can be combined. Skip the first two and return five:
+                '?offset=2&limit=5'
+
+        :param  folder_id: encoded ID of the folder which contents should be library_dataset_dict
+        :type   folder_id: encoded string
+
+        :param  offset: number of folder contents to skip
+        :type   offset: optional int
+
+        :param  limit: maximum number of folder contents to return
+        :type   limit: optional int
+
+        :param  include_deleted: whether to include deleted items in the results
+        :type   include_deleted: optional bool (default False)
+
+        :returns: dictionary containing all items and metadata
+        :type:    dict
+
+        :raises: MalformedId, InconsistentDatabase, ObjectNotFound,
+             InternalServerError
+        """
+        is_admin = trans.user_is_admin
+        current_user_roles = trans.get_current_user_roles()
+
+        decoded_folder_id = self.folder_manager.cut_and_decode(trans, folder_id)
+        folder = self.folder_manager.get(trans, decoded_folder_id)
+
+        # Special level of security on top of libraries.
+        if trans.app.security_agent.can_access_library(current_user_roles, folder.parent_library) or is_admin:
+            pass
+        else:
+            if trans.user:
+                log.warning(f"SECURITY: User (id: {trans.user.id}) without proper access rights is trying to load folder with ID of {decoded_folder_id}")
+            else:
+                log.warning(f"SECURITY: Anonymous user is trying to load restricted folder with ID of {decoded_folder_id}")
+            raise exceptions.ObjectNotFound(f'Folder with the id provided ( {folder_id} ) was not found')
+
+        folder_contents = []
+        update_time = ''
+        create_time = ''
+
+        folders, datasets = self._apply_preferences(folder, include_deleted, search_text)
+
+        #  Go through every accessible item (folders, datasets) in the folder and include its metadata.
+        for content_item in self._load_folder_contents(trans, folders, datasets, offset, limit):
+            return_item = {}
+            encoded_id = trans.security.encode_id(content_item.id)
+            create_time = content_item.create_time.strftime(TIME_FORMAT)
+
+            if content_item.api_type == FOLDER_TYPE_NAME:
+                encoded_id = f'F{encoded_id}'
+                can_modify = is_admin or (trans.user and trans.app.security_agent.can_modify_library_item(current_user_roles, folder))
+                can_manage = is_admin or (trans.user and trans.app.security_agent.can_manage_library_item(current_user_roles, folder))
+                update_time = content_item.update_time.strftime(TIME_FORMAT)
+                return_item.update(dict(can_modify=can_modify, can_manage=can_manage))
+                if content_item.description:
+                    return_item.update(dict(description=content_item.description))
+
+            elif content_item.api_type == FILE_TYPE_NAME:
+                #  Is the dataset public or private?
+                #  When both are False the dataset is 'restricted'
+                #  Access rights are checked on the dataset level, not on the ld or ldda level to maintain consistency
+                dataset = content_item.library_dataset_dataset_association.dataset
+                is_unrestricted = trans.app.security_agent.dataset_is_public(dataset)
+                is_private = not is_unrestricted and trans.user and trans.app.security_agent.dataset_is_private_to_user(trans, dataset)
+
+                # Can user manage the permissions on the dataset?
+                can_manage = is_admin or (trans.user and trans.app.security_agent.can_manage_dataset(current_user_roles, content_item.library_dataset_dataset_association.dataset))
+                raw_size = int(content_item.library_dataset_dataset_association.get_size())
+                nice_size = util.nice_size(raw_size)
+                update_time = content_item.library_dataset_dataset_association.update_time.strftime(TIME_FORMAT)
+
+                library_dataset_dict = content_item.to_dict()
+                encoded_ldda_id = trans.security.encode_id(content_item.library_dataset_dataset_association.id)
+
+                tag_manager = tags.GalaxyTagHandler(trans.sa_session)
+                ldda_tags = tag_manager.get_tags_str(content_item.library_dataset_dataset_association.tags)
+
+                return_item.update(dict(file_ext=library_dataset_dict['file_ext'],
+                                        date_uploaded=library_dataset_dict['date_uploaded'],
+                                        update_time=update_time,
+                                        is_unrestricted=is_unrestricted,
+                                        is_private=is_private,
+                                        can_manage=can_manage,
+                                        state=library_dataset_dict['state'],
+                                        file_size=nice_size,
+                                        raw_size=raw_size,
+                                        ldda_id=encoded_ldda_id,
+                                        tags=ldda_tags))
+                if content_item.library_dataset_dataset_association.message:
+                    return_item.update(dict(message=content_item.library_dataset_dataset_association.message))
+                elif content_item.library_dataset_dataset_association.info:
+                    # There is no message but ldda info contains something so we display that instead.
+                    return_item.update(dict(message=content_item.library_dataset_dataset_association.info))
+
+            # For every item include the default metadata
+            return_item.update(dict(id=encoded_id,
+                                    type=content_item.api_type,
+                                    name=content_item.name,
+                                    update_time=update_time,
+                                    create_time=create_time,
+                                    deleted=content_item.deleted))
+            folder_contents.append(return_item)
+
+        # Return the reversed path so it starts with the library node.
+        full_path = self._build_path(trans, folder)[::-1]
+
+        user_can_add_library_item = is_admin or trans.app.security_agent.can_add_library_item(current_user_roles, folder)
+
+        user_can_modify_folder = is_admin or trans.app.security_agent.can_modify_library_item(current_user_roles, folder)
+
+        parent_library_id = None
+        if folder.parent_library is not None:
+            parent_library_id = trans.security.encode_id(folder.parent_library.id)
+
+        total_rows = len(folders) + len(datasets)
+
+        metadata = dict(full_path=full_path,
+                        total_rows=total_rows,
+                        can_add_library_item=user_can_add_library_item,
+                        can_modify_folder=user_can_modify_folder,
+                        folder_name=folder.name,
+                        folder_description=folder.description,
+                        parent_library_id=parent_library_id)
+        folder_container = dict(metadata=metadata, folder_contents=folder_contents)
+        return folder_container
+
+    def create(self, trans, encoded_folder_id, payload, **kwd):
+        """
+        Create a new library file from an HDA.
+
+        :param  encoded_folder_id:      the encoded id of the folder to import dataset(s) to
+        :type   encoded_folder_id:      an encoded id string
+        :param  payload:    dictionary structure containing:
+            :param from_hda_id:         (optional) the id of an accessible HDA to copy into the library
+            :type  from_hda_id:         encoded id
+            :param from_hdca_id:         (optional) the id of an accessible HDCA to copy into the library
+            :type  from_hdca_id:         encoded id
+            :param ldda_message:        (optional) the new message attribute of the LDDA created
+            :type   ldda_message:       str
+            :param extended_metadata:   (optional) dub-dictionary containing any extended metadata to associate with the item
+            :type  extended_metadata:   dict
+        :type   payload:    dict
+
+        :returns:   a dictionary describing the new item if ``from_hda_id`` is supplied or a list of
+                    such dictionaries describing the new items if ``from_hdca_id`` is supplied.
+        :rtype:     object
+
+        :raises:    ObjectAttributeInvalidException,
+            InsufficientPermissionsException, ItemAccessibilityException,
+            InternalServerError
+        """
+        encoded_folder_id_16 = self.__decode_library_content_id(trans, encoded_folder_id)
+        from_hda_id = payload.pop('from_hda_id', None)
+        from_hdca_id = payload.pop('from_hdca_id', None)
+        ldda_message = payload.pop('ldda_message', '')
+        try:
+            if from_hda_id:
+                decoded_hda_id = self._decode_id(from_hda_id)
+                return self._copy_hda_to_library_folder(trans, self.hda_manager, decoded_hda_id, encoded_folder_id_16, ldda_message)
+            if from_hdca_id:
+                decoded_hdca_id = self._decode_id(from_hdca_id)
+                return self._copy_hdca_to_library_folder(trans, self.hda_manager, decoded_hdca_id, encoded_folder_id_16, ldda_message)
+        except Exception as exc:
+            # TODO handle exceptions better within the mixins
+            exc_message = util.unicodify(exc)
+            if 'not accessible to the current user' in exc_message or 'You are not allowed to access this dataset' in exc_message:
+                raise exceptions.ItemAccessibilityException('You do not have access to the requested item')
+            else:
+                log.exception(exc)
+                raise exc
+
+    def _decode_id(self, id):
+        return managers_base.decode_id(self.app, id)
+
+    def __decode_library_content_id(self, trans, encoded_folder_id):
+        """
+        Identify whether the id provided is properly encoded LibraryFolder.
+
+        :param  encoded_folder_id:  encoded id of Galaxy LibraryFolder
+        :type   encoded_folder_id:  encoded string
+
+        :returns:   encoded id of Folder (had 'F' prepended)
+        :type:  string
+
+        :raises:    MalformedId
+        """
+        if ((len(encoded_folder_id) % 16 == 1) and encoded_folder_id.startswith('F')):
+            return encoded_folder_id[1:]
+        else:
+            raise exceptions.MalformedId('Malformed folder id ( %s ) specified, unable to decode.' % str(encoded_folder_id))
+
+    def _build_path(self, trans, folder):
+        """
+        Search the path upwards recursively and load the whole route of
+        names and ids for breadcrumb building purposes.
+
+        :param folder: current folder for navigating up
+        :param type:   Galaxy LibraryFolder
+
+        :returns:   list consisting of full path to the library
+        :type:      list
+        """
+        path_to_root = []
+        # We are almost in root
+        encoded_id = trans.security.encode_id(folder.id)
+        path_to_root.append((f'F{encoded_id}', folder.name))
+        if folder.parent_id is not None:
+            # We add the current folder and traverse up one folder.
+            upper_folder = trans.sa_session.query(trans.app.model.LibraryFolder).get(folder.parent_id)
+            path_to_root.extend(self._build_path(trans, upper_folder))
+        return path_to_root
+
+    def _load_folder_contents(self, trans, folders, datasets, offset=None, limit=None):
+        """
+        Loads all contents of the folder (folders and data sets) but only
+        in the first level. Include deleted if the flag is set and if the
+        user has access to undelete it.
+
+        :param  folder:          the folder which contents are being loaded
+        :type   folder:          Galaxy LibraryFolder
+
+        :param  include_deleted: flag, when true the items that are deleted
+            and can be undeleted by current user are shown
+        :type   include_deleted: boolean
+
+        :returns:   a list containing the requested items
+        :type:      list
+        """
+        current_user_roles = trans.get_current_user_roles()
+        is_admin = trans.user_is_admin
+        content_items = []
+
+        offset = 0 if offset is None else int(offset)
+        limit = 0 if limit is None else int(limit)
+
+        current_folders = self._calculate_pagination(folders, offset, limit)
+
+        for subfolder in current_folders:
+            if not subfolder.deleted or is_admin or trans.app.security_agent.can_modify_library_item(current_user_roles, subfolder):
+                # Undeleted folders are non-restricted for now.
+                # Admins or users with MODIFY permissions can see deleted folders.
+                subfolder.api_type = FOLDER_TYPE_NAME
+                content_items.append(subfolder)
+
+        limit -= len(content_items)
+        offset -= len(folders)
+        offset = max(0, offset)
+
+        current_datasets = self._calculate_pagination(datasets, offset, limit)
+
+        for dataset in current_datasets:
+            if dataset.deleted:
+                if is_admin or trans.app.security_agent.can_modify_library_item(current_user_roles, dataset):
+                    # Admins or users with MODIFY permissions can see deleted folders.
+                    dataset.api_type = FILE_TYPE_NAME
+                    content_items.append(dataset)
+            else:
+                if is_admin or trans.app.security_agent.can_access_dataset(current_user_roles, dataset.library_dataset_dataset_association.dataset):
+                    # Admins or users with ACCESS permissions can see datasets.
+                    dataset.api_type = FILE_TYPE_NAME
+                    content_items.append(dataset)
+
+        return content_items
+
+    def _calculate_pagination(self, items, offset: int, limit: int):
+        if limit > 0:
+            paginated_items = items[offset:offset + limit]
+        else:
+            paginated_items = items[offset:]
+        return paginated_items
+
+    def _apply_preferences(self, folder, include_deleted: bool, search_text: str):
+
+        def check_deleted(array, include_deleted):
+            if include_deleted:
+                result_array = array
+            else:
+                result_array = [data for data in array if data.deleted == include_deleted]
+            return result_array
+
+        def filter_searched_datasets(dataset):
+            if dataset.library_dataset_dataset_association.message:
+                description = dataset.library_dataset_dataset_association.message
+            elif dataset.library_dataset_dataset_association.info:
+                description = dataset.library_dataset_dataset_association.info
+            else:
+                description = ''
+
+            return search_text in dataset.name or search_text in description
+
+        datasets = check_deleted(folder.datasets, include_deleted)
+        folders = check_deleted(folder.folders, include_deleted)
+
+        if search_text is not None:
+            folders = [item for item in folders if search_text in item.name or search_text in item.description]
+            datasets = list(filter(filter_searched_datasets, datasets))
+
+        return folders, datasets
+
+
+class FolderContentsController(BaseGalaxyAPIController):
     """
     Class controls retrieval, creation and updating of folder contents.
     """
-    hda_manager: HDAManager = depends(HDAManager)
-    folder_manager: FolderManager = depends(FolderManager)
+    view: FolderContentsAPIView = depends(FolderContentsAPIView)
 
     @expose_api_anonymous
     def index(self, trans, folder_id, limit=None, offset=None, search_text=None, **kwd):
@@ -63,260 +392,8 @@ class FolderContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLi
         :raises: MalformedId, InconsistentDatabase, ObjectNotFound,
              InternalServerError
         """
-        is_admin = trans.user_is_admin
-        deleted = kwd.get('include_deleted', 'missing')
-        current_user_roles = trans.get_current_user_roles()
-        try:
-            deleted = util.asbool(deleted)
-        except ValueError:
-            deleted = False
-
-        decoded_folder_id = self.folder_manager.cut_and_decode(trans, folder_id)
-        folder = self.folder_manager.get(trans, decoded_folder_id)
-
-        # Special level of security on top of libraries.
-        if trans.app.security_agent.can_access_library(current_user_roles, folder.parent_library) or is_admin:
-            pass
-        else:
-            if trans.user:
-                log.warning(f"SECURITY: User (id: {trans.user.id}) without proper access rights is trying to load folder with ID of {decoded_folder_id}")
-            else:
-                log.warning("SECURITY: Anonymous user is trying to load restricted folder with ID of %s" % (decoded_folder_id))
-            raise exceptions.ObjectNotFound('Folder with the id provided ( %s ) was not found' % str(folder_id))
-
-        folder_contents = []
-        update_time = ''
-        create_time = ''
-
-        folders, datasets = self.apply_preferences(folder, deleted, search_text)
-
-        #  Go through every accessible item (folders, datasets) in the folder and include its metadata.
-        for content_item in self._load_folder_contents(trans, folders, datasets, offset, limit):
-            return_item = {}
-            encoded_id = trans.security.encode_id(content_item.id)
-            create_time = content_item.create_time.strftime("%Y-%m-%d %I:%M %p")
-
-            if content_item.api_type == 'folder':
-                encoded_id = 'F' + encoded_id
-                can_modify = is_admin or (trans.user and trans.app.security_agent.can_modify_library_item(current_user_roles, folder))
-                can_manage = is_admin or (trans.user and trans.app.security_agent.can_manage_library_item(current_user_roles, folder))
-                update_time = content_item.update_time.strftime("%Y-%m-%d %I:%M %p")
-                return_item.update(dict(can_modify=can_modify, can_manage=can_manage))
-                if content_item.description:
-                    return_item.update(dict(description=content_item.description))
-
-            elif content_item.api_type == 'file':
-                #  Is the dataset public or private?
-                #  When both are False the dataset is 'restricted'
-                #  Access rights are checked on the dataset level, not on the ld or ldda level to maintain consistency
-                dataset = content_item.library_dataset_dataset_association.dataset
-                is_unrestricted = trans.app.security_agent.dataset_is_public(dataset)
-                if not is_unrestricted and trans.user and trans.app.security_agent.dataset_is_private_to_user(trans, dataset):
-                    is_private = True
-                else:
-                    is_private = False
-
-                # Can user manage the permissions on the dataset?
-                can_manage = is_admin or (trans.user and trans.app.security_agent.can_manage_dataset(current_user_roles, content_item.library_dataset_dataset_association.dataset))
-                raw_size = int(content_item.library_dataset_dataset_association.get_size())
-                nice_size = util.nice_size(raw_size)
-                update_time = content_item.library_dataset_dataset_association.update_time.strftime("%Y-%m-%d %I:%M %p")
-
-                library_dataset_dict = content_item.to_dict()
-                encoded_ldda_id = trans.security.encode_id(content_item.library_dataset_dataset_association.id)
-
-                tag_manager = tags.GalaxyTagHandler(trans.sa_session)
-                ldda_tags = tag_manager.get_tags_str(content_item.library_dataset_dataset_association.tags)
-
-                return_item.update(dict(file_ext=library_dataset_dict['file_ext'],
-                                        date_uploaded=library_dataset_dict['date_uploaded'],
-                                        update_time=update_time,
-                                        is_unrestricted=is_unrestricted,
-                                        is_private=is_private,
-                                        can_manage=can_manage,
-                                        state=library_dataset_dict['state'],
-                                        file_size=nice_size,
-                                        raw_size=raw_size,
-                                        ldda_id=encoded_ldda_id,
-                                        tags=ldda_tags))
-                if content_item.library_dataset_dataset_association.message:
-                    return_item.update(dict(message=content_item.library_dataset_dataset_association.message))
-                elif content_item.library_dataset_dataset_association.info:
-                    # There is no message but ldda info contains something so we display that instead.
-                    return_item.update(dict(message=content_item.library_dataset_dataset_association.info))
-
-            # For every item include the default metadata
-            return_item.update(dict(id=encoded_id,
-                                    type=content_item.api_type,
-                                    name=content_item.name,
-                                    update_time=update_time,
-                                    create_time=create_time,
-                                    deleted=content_item.deleted))
-            folder_contents.append(return_item)
-
-        # Return the reversed path so it starts with the library node.
-        full_path = self.build_path(trans, folder)[::-1]
-
-        # Check whether user can add items to the current folder
-        can_add_library_item = is_admin or trans.app.security_agent.can_add_library_item(current_user_roles, folder)
-
-        # Check whether user can modify the current folder
-        can_modify_folder = is_admin or trans.app.security_agent.can_modify_library_item(current_user_roles, folder)
-
-        parent_library_id = None
-        if folder.parent_library is not None:
-            parent_library_id = trans.security.encode_id(folder.parent_library.id)
-
-        total_rows = len(folders) + len(datasets)
-
-        metadata = dict(full_path=full_path,
-                        total_rows=total_rows,
-                        can_add_library_item=can_add_library_item,
-                        can_modify_folder=can_modify_folder,
-                        folder_name=folder.name,
-                        folder_description=folder.description,
-                        parent_library_id=parent_library_id)
-        folder_container = dict(metadata=metadata, folder_contents=folder_contents)
-        return folder_container
-
-    def build_path(self, trans, folder):
-        """
-        Search the path upwards recursively and load the whole route of
-        names and ids for breadcrumb building purposes.
-
-        :param folder: current folder for navigating up
-        :param type:   Galaxy LibraryFolder
-
-        :returns:   list consisting of full path to the library
-        :type:      list
-        """
-        path_to_root = []
-        # We are almost in root
-        if folder.parent_id is None:
-            path_to_root.append(('F' + trans.security.encode_id(folder.id), folder.name))
-        else:
-            # We add the current folder and traverse up one folder.
-            path_to_root.append(('F' + trans.security.encode_id(folder.id), folder.name))
-            upper_folder = trans.sa_session.query(trans.app.model.LibraryFolder).get(folder.parent_id)
-            path_to_root.extend(self.build_path(trans, upper_folder))
-        return path_to_root
-
-    def _load_folder_contents(self, trans, folders, datasets, offset=None, limit=None):
-        """
-        Loads all contents of the folder (folders and data sets) but only
-        in the first level. Include deleted if the flag is set and if the
-        user has access to undelete it.
-
-        :param  folder:          the folder which contents are being loaded
-        :type   folder:          Galaxy LibraryFolder
-
-        :param  include_deleted: flag, when true the items that are deleted
-            and can be undeleted by current user are shown
-        :type   include_deleted: boolean
-
-        :returns:   a list containing the requested items
-        :type:      list
-        """
-        current_user_roles = trans.get_current_user_roles()
-        is_admin = trans.user_is_admin
-        content_items = []
-
-        offset = 0 if offset is None else int(offset)
-        limit = 0 if limit is None else int(limit)
-
-        current_folders = self._calculate_pagination(folders, offset, limit)
-
-        for subfolder in current_folders:
-
-            if subfolder.deleted:
-                if is_admin:
-                    # Admins can see all deleted folders.
-                    subfolder.api_type = 'folder'
-                    content_items.append(subfolder)
-                else:
-                    # Users with MODIFY permissions can see deleted folders.
-                    can_modify = trans.app.security_agent.can_modify_library_item(current_user_roles, subfolder)
-                    if can_modify:
-                        subfolder.api_type = 'folder'
-                        content_items.append(subfolder)
-            else:
-                # Undeleted folders are non-restricted for now. The contents are not.
-                # TODO decide on restrictions
-                subfolder.api_type = 'folder'
-                content_items.append(subfolder)
-                # if is_admin:
-                #     subfolder.api_type = 'folder'
-                #     content_items.append( subfolder )
-                # else:
-                #     can_access, folder_ids = trans.app.security_agent.check_folder_contents( trans.user, current_user_roles, subfolder )
-                #     if can_access:
-                #         subfolder.api_type = 'folder'
-                #         content_items.append( subfolder )
-
-        limit -= len(content_items)
-        offset -= len(folders)
-        offset = 0 if offset < 0 else offset
-
-        current_datasets = self._calculate_pagination(datasets, offset, limit)
-
-        for dataset in current_datasets:
-            if dataset.deleted:
-                if is_admin:
-                    # Admins can see all deleted datasets.
-                    dataset.api_type = 'file'
-                    content_items.append(dataset)
-                else:
-                    # Users with MODIFY permissions on the item can see the deleted item.
-                    can_modify = trans.app.security_agent.can_modify_library_item(current_user_roles, dataset)
-                    if can_modify:
-                        dataset.api_type = 'file'
-                        content_items.append(dataset)
-            else:
-                if is_admin:
-                    dataset.api_type = 'file'
-                    content_items.append(dataset)
-                else:
-                    can_access = trans.app.security_agent.can_access_dataset(current_user_roles, dataset.library_dataset_dataset_association.dataset)
-                    if can_access:
-                        dataset.api_type = 'file'
-                        content_items.append(dataset)
-
-        return content_items
-
-    def _calculate_pagination(self, items, offset: int, limit: int):
-        if limit > 0:
-            paginated_items = items[offset:offset + limit]
-        else:
-            paginated_items = items[offset:]
-        return paginated_items
-
-    def apply_preferences(self, folder, include_deleted, search_text):
-
-        def check_deleted(array, include_deleted):
-            if include_deleted:
-                result_array = array
-            else:
-                result_array = [data for data in array if data.deleted == include_deleted]
-            return result_array
-
-        def filter_searched_datasets(dataset):
-            if dataset.library_dataset_dataset_association.message:
-                description = dataset.library_dataset_dataset_association.message
-            elif dataset.library_dataset_dataset_association.info:
-                description = dataset.library_dataset_dataset_association.info
-            else:
-                description = ''
-
-            return search_text in dataset.name or search_text in description
-
-        datasets = check_deleted(folder.datasets, include_deleted)
-        folders = check_deleted(folder.folders, include_deleted)
-
-        if search_text is not None:
-            folders = [item for item in folders if search_text in item.name or search_text in item.description]
-            datasets = list(filter(filter_searched_datasets, datasets))
-
-        return folders, datasets
+        include_deleted = util.asbool(kwd.get('include_deleted', False))
+        return self.view.index(trans, folder_id, limit, offset, search_text, include_deleted)
 
     @expose_api
     def create(self, trans, encoded_folder_id, payload, **kwd):
@@ -346,56 +423,4 @@ class FolderContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLi
             InsufficientPermissionsException, ItemAccessibilityException,
             InternalServerError
         """
-        encoded_folder_id_16 = self.__decode_library_content_id(trans, encoded_folder_id)
-        from_hda_id = payload.pop('from_hda_id', None)
-        from_hdca_id = payload.pop('from_hdca_id', None)
-        ldda_message = payload.pop('ldda_message', '')
-        if ldda_message:
-            ldda_message = util.sanitize_html.sanitize_html(ldda_message)
-        try:
-            if from_hda_id:
-                decoded_hda_id = self.decode_id(from_hda_id)
-                return self._copy_hda_to_library_folder(trans, self.hda_manager, decoded_hda_id, encoded_folder_id_16, ldda_message)
-            if from_hdca_id:
-                decoded_hdca_id = self.decode_id(from_hdca_id)
-                return self._copy_hdca_to_library_folder(trans, self.hda_manager, decoded_hdca_id, encoded_folder_id_16, ldda_message)
-        except Exception as exc:
-            # TODO handle exceptions better within the mixins
-            exc_message = util.unicodify(exc)
-            if 'not accessible to the current user' in exc_message or 'You are not allowed to access this dataset' in exc_message:
-                raise exceptions.ItemAccessibilityException('You do not have access to the requested item')
-            else:
-                log.exception(exc)
-                raise exc
-
-    def __decode_library_content_id(self, trans, encoded_folder_id):
-        """
-        Identify whether the id provided is properly encoded
-        LibraryFolder.
-
-        :param  encoded_folder_id:  encoded id of Galaxy LibraryFolder
-        :type   encoded_folder_id:  encoded string
-
-        :returns:   encoded id of Folder (had 'F' prepended)
-        :type:  string
-
-        :raises:    MalformedId
-        """
-        if ((len(encoded_folder_id) % 16 == 1) and encoded_folder_id.startswith('F')):
-            return encoded_folder_id[1:]
-        else:
-            raise exceptions.MalformedId('Malformed folder id ( %s ) specified, unable to decode.' % str(encoded_folder_id))
-
-    @expose_api
-    def show(self, trans, id, library_id, **kwd):
-        """
-        GET /api/folders/{encoded_folder_id}/
-        """
-        raise exceptions.NotImplemented('Showing the library folder content is not implemented here.')
-
-    @expose_api
-    def update(self, trans, id, library_id, payload, **kwd):
-        """
-        PUT /api/folders/{encoded_folder_id}/contents
-        """
-        raise exceptions.NotImplemented('Updating the library folder content is not implemented here.')
+        return self.view.create(trans, encoded_folder_id, payload)
diff --git a/lib/galaxy/webapps/galaxy/api/folders.py b/lib/galaxy/webapps/galaxy/api/folders.py
index 2c13f77e206..9341ca9ee57 100644
--- a/lib/galaxy/webapps/galaxy/api/folders.py
+++ b/lib/galaxy/webapps/galaxy/api/folders.py
@@ -7,21 +7,19 @@ from galaxy import (
     exceptions,
     util
 )
-from galaxy.managers import folders, roles
-from galaxy.structured_app import StructuredApp
+from galaxy.managers.folders import FoldersService
 from galaxy.web import expose_api
-from galaxy.webapps.base.controller import UsesLibraryMixin, UsesLibraryMixinItems
-from . import BaseGalaxyAPIController
+from . import (
+    BaseGalaxyAPIController,
+    depends,
+)
 
 log = logging.getLogger(__name__)
 
 
-class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMixinItems):
+class FoldersController(BaseGalaxyAPIController):
 
-    def __init__(self, app: StructuredApp):
-        super().__init__(app)
-        self.folder_manager = folders.FolderManager()
-        self.role_manager = roles.RoleManager(app)
+    service: FoldersService = depends(FoldersService)
 
     @expose_api
     def index(self, trans, **kwd):
@@ -46,13 +44,10 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
         :returns:   dictionary including details of the folder
         :rtype:     dict
         """
-        folder_id = self.folder_manager.cut_and_decode(trans, id)
-        folder = self.folder_manager.get(trans, folder_id, check_manageable=False, check_accessible=True)
-        return_dict = self.folder_manager.get_folder_dict(trans, folder)
-        return return_dict
+        return self.service.show(trans, id)
 
     @expose_api
-    def create(self, trans, encoded_parent_folder_id, payload=None, **kwd):
+    def create(self, trans, encoded_parent_folder_id, payload, **kwd):
         """
         POST /api/folders/{encoded_parent_folder_id}
 
@@ -72,16 +67,7 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
         :rtype:     dictionary
         :raises: RequestParameterMissingException
         """
-        if payload:
-            kwd.update(payload)
-        name = kwd.get('name', None)
-        if name is None:
-            raise exceptions.RequestParameterMissingException("Missing required parameter 'name'.")
-        description = kwd.get('description', '')
-        decoded_parent_folder_id = self.folder_manager.cut_and_decode(trans, encoded_parent_folder_id)
-        parent_folder = self.folder_manager.get(trans, decoded_parent_folder_id)
-        new_folder = self.folder_manager.create(trans, parent_folder.id, name, description)
-        return self.folder_manager.get_folder_dict(trans, new_folder)
+        return self.service.create(trans, encoded_parent_folder_id, payload)
 
     @expose_api
     def get_permissions(self, trans, encoded_folder_id, **kwd):
@@ -101,41 +87,14 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
 
         :raises: InsufficientPermissionsException
         """
-        current_user_roles = trans.get_current_user_roles()
-        is_admin = trans.user_is_admin
-        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
-        folder = self.folder_manager.get(trans, decoded_folder_id)
-
-        if not (is_admin or trans.app.security_agent.can_manage_library_item(current_user_roles, folder)):
-            raise exceptions.InsufficientPermissionsException('You do not have proper permission to access permissions of this folder.')
-
         scope = kwd.get('scope', None)
-        if scope == 'current' or scope is None:
-            return self.folder_manager.get_current_roles(trans, folder)
-        #  Return roles that are available to select.
-        elif scope == 'available':
-            page = kwd.get('page', None)
-            if page is not None:
-                page = int(page)
-            else:
-                page = 1
-            page_limit = kwd.get('page_limit', None)
-            if page_limit is not None:
-                page_limit = int(page_limit)
-            else:
-                page_limit = 10
-            query = kwd.get('q', None)
-            roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder, query, page, page_limit)
-            return_roles = []
-            for role in roles:
-                role_id = trans.security.encode_id(role.id)
-                return_roles.append(dict(id=role_id, name=role.name, type=role.type))
-            return dict(roles=return_roles, page=page, page_limit=page_limit, total=total_roles)
-        else:
-            raise exceptions.RequestParameterInvalidException("The value of 'scope' parameter is invalid. Alllowed values: current, available")
+        page = kwd.get('page', None)
+        page_limit = kwd.get('page_limit', None)
+        query = kwd.get('q', None)
+        return self.service.get_permissions(trans, encoded_folder_id, scope, page, page_limit, query)
 
     @expose_api
-    def set_permissions(self, trans, encoded_folder_id, payload=None, **kwd):
+    def set_permissions(self, trans, encoded_folder_id, payload, **kwd):
         """
         POST /api/folders/{encoded_folder_id}/permissions
 
@@ -159,75 +118,7 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
         :rtype:     dictionary
         :raises: RequestParameterInvalidException, InsufficientPermissionsException, RequestParameterMissingException
         """
-        if payload:
-            kwd.update(payload)
-        is_admin = trans.user_is_admin
-        current_user_roles = trans.get_current_user_roles()
-        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
-        folder = self.folder_manager.get(trans, decoded_folder_id)
-        if not (is_admin or trans.app.security_agent.can_manage_library_item(current_user_roles, folder)):
-            raise exceptions.InsufficientPermissionsException('You do not have proper permission to modify permissions of this folder.')
-
-        new_add_roles_ids = util.listify(kwd.get('add_ids[]', None))
-        new_manage_roles_ids = util.listify(kwd.get('manage_ids[]', None))
-        new_modify_roles_ids = util.listify(kwd.get('modify_ids[]', None))
-
-        action = kwd.get('action', None)
-        if action is None:
-            raise exceptions.RequestParameterMissingException('The mandatory parameter "action" is missing.')
-        elif action == 'set_permissions':
-
-            # ADD TO LIBRARY ROLES
-            valid_add_roles = []
-            invalid_add_roles_names = []
-            for role_id in new_add_roles_ids:
-                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
-                #  Check whether role is in the set of allowed roles
-                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
-                if role in valid_roles:
-                    valid_add_roles.append(role)
-                else:
-                    invalid_add_roles_names.append(role_id)
-            if len(invalid_add_roles_names) > 0:
-                log.warning("The following roles could not be added to the add library item permission: " + str(invalid_add_roles_names))
-
-            # MANAGE FOLDER ROLES
-            valid_manage_roles = []
-            invalid_manage_roles_names = []
-            for role_id in new_manage_roles_ids:
-                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
-                #  Check whether role is in the set of allowed roles
-                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
-                if role in valid_roles:
-                    valid_manage_roles.append(role)
-                else:
-                    invalid_manage_roles_names.append(role_id)
-            if len(invalid_manage_roles_names) > 0:
-                log.warning("The following roles could not be added to the manage folder permission: " + str(invalid_manage_roles_names))
-
-            # MODIFY FOLDER ROLES
-            valid_modify_roles = []
-            invalid_modify_roles_names = []
-            for role_id in new_modify_roles_ids:
-                role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
-                #  Check whether role is in the set of allowed roles
-                valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, folder)
-                if role in valid_roles:
-                    valid_modify_roles.append(role)
-                else:
-                    invalid_modify_roles_names.append(role_id)
-            if len(invalid_modify_roles_names) > 0:
-                log.warning("The following roles could not be added to the modify folder permission: " + str(invalid_modify_roles_names))
-
-            permissions = {trans.app.security_agent.permitted_actions.LIBRARY_ADD: valid_add_roles}
-            permissions.update({trans.app.security_agent.permitted_actions.LIBRARY_MANAGE: valid_manage_roles})
-            permissions.update({trans.app.security_agent.permitted_actions.LIBRARY_MODIFY: valid_modify_roles})
-
-            trans.app.security_agent.set_all_library_permissions(trans, folder, permissions)
-        else:
-            raise exceptions.RequestParameterInvalidException('The mandatory parameter "action" has an invalid value.'
-                                                              'Allowed values are: "set_permissions"')
-        return self.folder_manager.get_current_roles(trans, folder)
+        return self.service.set_permissions(trans, encoded_folder_id, payload)
 
     @expose_api
     def delete(self, trans, encoded_folder_id, **kwd):
@@ -249,14 +140,11 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
         :rtype:     dictionary
 
         """
-        folder = self.folder_manager.get(trans, self.folder_manager.cut_and_decode(trans, encoded_folder_id), True)
         undelete = util.string_as_bool(kwd.get('undelete', False))
-        folder = self.folder_manager.delete(trans, folder, undelete)
-        folder_dict = self.folder_manager.get_folder_dict(trans, folder)
-        return folder_dict
+        return self.service.delete(trans, encoded_folder_id, undelete)
 
     @expose_api
-    def update(self, trans, encoded_folder_id, payload=None, **kwd):
+    def update(self, trans, encoded_folder_id, payload, **kwd):
         """
         PATCH /api/folders/{encoded_folder_id}
 
@@ -278,28 +166,4 @@ class FoldersController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMi
 
         :raises: RequestParameterMissingException
         """
-        decoded_folder_id = self.folder_manager.cut_and_decode(trans, encoded_folder_id)
-        folder = self.folder_manager.get(trans, decoded_folder_id)
-        if payload:
-            kwd.update(payload)
-        name = kwd.get('name', None)
-        if not name:
-            raise exceptions.RequestParameterMissingException("Parameter 'name' of library folder is required. You cannot remove it.")
-        description = kwd.get('description', None)
-        updated_folder = self.folder_manager.update(trans, folder, name, description)
-        folder_dict = self.folder_manager.get_folder_dict(trans, updated_folder)
-        return folder_dict
-
-    def __decode_id(self, trans, encoded_id, object_name=None):
-        """
-        Try to decode the id.
-
-        :param  object_name:      Name of the object the id belongs to. (optional)
-        :type   object_name:      str
-        """
-        try:
-            return trans.security.decode_id(encoded_id)
-        except TypeError:
-            raise exceptions.MalformedId('Malformed %s id specified, unable to decode.' % object_name if object_name is not None else '')
-        except ValueError:
-            raise exceptions.MalformedId('Wrong %s id specified, unable to decode.' % object_name if object_name is not None else '')
+        return self.service.update(trans, encoded_folder_id, payload)
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index f299011bc19..956ec2f2ed9 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -20,6 +20,7 @@ from galaxy import (
 from galaxy.managers import (
     citations,
     histories,
+    sharable,
     users,
     workflows,
 )
@@ -36,14 +37,13 @@ from galaxy.web import (
 from galaxy.webapps.base.controller import (
     ExportsHistoryMixin,
     ImportsHistoryMixin,
-    SharableMixin
 )
 from . import BaseGalaxyAPIController, depends
 
 log = logging.getLogger(__name__)
 
 
-class HistoriesController(BaseGalaxyAPIController, ExportsHistoryMixin, ImportsHistoryMixin, SharableMixin):
+class HistoriesController(BaseGalaxyAPIController, ExportsHistoryMixin, ImportsHistoryMixin):
     citations_manager: citations.CitationsManager = depends(citations.CitationsManager)
     user_manager: users.UserManager = depends(users.UserManager)
     workflow_manager: workflows.WorkflowsManager = depends(workflows.WorkflowsManager)
@@ -52,6 +52,8 @@ class HistoriesController(BaseGalaxyAPIController, ExportsHistoryMixin, ImportsH
     serializer: histories.HistorySerializer = depends(histories.HistorySerializer)
     deserializer: histories.HistoryDeserializer = depends(histories.HistoryDeserializer)
     filters: histories.HistoryFilters = depends(histories.HistoryFilters)
+    # TODO move all managers above and the actions logic to the HistoriesService
+    service: histories.HistoriesService = depends(histories.HistoriesService)
 
     @expose_api_anonymous
     def index(self, trans, deleted='False', **kwd):
@@ -577,3 +579,13 @@ class HistoriesController(BaseGalaxyAPIController, ExportsHistoryMixin, ImportsH
             'installed_builds': [{'label': ins, 'value': ins} for ins in installed_builds],
             'fasta_hdas': [{'label': f'{hda.hid}: {hda.name}', 'value': trans.security.encode_id(hda.id)} for hda in fasta_hdas],
         }
+
+    @expose_api
+    def sharing(self, trans, id, payload=None, **kwd):
+        """
+        * GET/POST /api/pages/{id}/sharing
+            View/modify sharing options for the page with the given id.
+        """
+        if payload:
+            payload = sharable.SharingPayload(**payload)
+        return self.service.sharing(trans, id, payload)
diff --git a/lib/galaxy/webapps/galaxy/api/history_contents.py b/lib/galaxy/webapps/galaxy/api/history_contents.py
index 2f93ae00360..8e84cfbaf54 100644
--- a/lib/galaxy/webapps/galaxy/api/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/history_contents.py
@@ -30,7 +30,6 @@ from galaxy.web import (
     expose_api_raw_anonymous
 )
 from galaxy.webapps.base.controller import (
-    UsesLibraryMixin,
     UsesLibraryMixinItems,
     UsesTagsMixin
 )
@@ -39,7 +38,7 @@ from . import BaseGalaxyAPIController, depends
 log = logging.getLogger(__name__)
 
 
-class HistoryContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMixinItems, UsesTagsMixin):
+class HistoryContentsController(BaseGalaxyAPIController, UsesLibraryMixinItems, UsesTagsMixin):
     hda_manager: hdas.HDAManager = depends(hdas.HDAManager)
     history_manager: histories.HistoryManager = depends(histories.HistoryManager)
     history_contents_manager: history_contents.HistoryContentsManager = depends(history_contents.HistoryContentsManager)
@@ -530,13 +529,21 @@ class HistoryContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesL
             content = payload.get('content', None)
             if content is None:
                 raise exceptions.RequestParameterMissingException("'content' id of target to copy is missing")
-            copy_elements = payload.get('copy_elements', False)
+            dbkey = payload.get("dbkey")
+            copy_required = dbkey is not None
+            copy_elements = payload.get('copy_elements', copy_required)
+            if copy_required and not copy_elements:
+                raise exceptions.RequestParameterMissingException("copy_elements passed as 'false' but it is required to change specified attributes")
+            dataset_instance_attributes = {}
+            if dbkey is not None:
+                dataset_instance_attributes["dbkey"] = dbkey
             dataset_collection_instance = service.copy(
                 trans=trans,
                 parent=history,
                 source="hdca",
                 encoded_source_id=content,
                 copy_elements=copy_elements,
+                dataset_instance_attributes=dataset_instance_attributes,
             )
         else:
             message = "Invalid 'source' parameter in request %s" % source
diff --git a/lib/galaxy/webapps/galaxy/api/jobs.py b/lib/galaxy/webapps/galaxy/api/jobs.py
index 2adefa84425..a21c0bc1e8a 100644
--- a/lib/galaxy/webapps/galaxy/api/jobs.py
+++ b/lib/galaxy/webapps/galaxy/api/jobs.py
@@ -8,10 +8,8 @@ import logging
 import typing
 
 from sqlalchemy import (
-    and_,
     or_,
 )
-from sqlalchemy.orm import aliased
 
 from galaxy import (
     exceptions,
@@ -135,16 +133,15 @@ class JobController(BaseGalaxyAPIController, UsesVisualizationMixin):
             decoded_user_id = self.decode_id(user_id)
         else:
             decoded_user_id = None
-        job_alias = aliased(model.Job)
         if is_admin:
             if decoded_user_id is not None:
-                query = trans.sa_session.query(job_alias).filter(job_alias.user_id == decoded_user_id)
+                query = trans.sa_session.query(model.Job).filter(model.Job.user_id == decoded_user_id)
             else:
-                query = trans.sa_session.query(job_alias)
+                query = trans.sa_session.query(model.Job)
         else:
             if decoded_user_id is not None and decoded_user_id != trans.user.id:
                 raise exceptions.AdminRequiredException("Only admins can index the jobs of others")
-            query = trans.sa_session.query(job_alias).filter(job_alias.user_id == trans.user.id)
+            query = trans.sa_session.query(model.Job).filter(model.Job.user_id == trans.user.id)
 
         def build_and_apply_filters(query, objects, filter_func):
             if objects is not None:
@@ -157,50 +154,42 @@ class JobController(BaseGalaxyAPIController, UsesVisualizationMixin):
                     query = query.filter(or_(*t))
             return query
 
-        query = build_and_apply_filters(query, state, lambda s: job_alias.state == s)
+        query = build_and_apply_filters(query, state, lambda s: model.Job.state == s)
 
-        query = build_and_apply_filters(query, kwd.get('tool_id', None), lambda t: job_alias.tool_id == t)
-        query = build_and_apply_filters(query, kwd.get('tool_id_like', None), lambda t: job_alias.tool_id.like(t))
+        query = build_and_apply_filters(query, kwd.get('tool_id', None), lambda t: model.Job.tool_id == t)
+        query = build_and_apply_filters(query, kwd.get('tool_id_like', None), lambda t: model.Job.tool_id.like(t))
 
-        query = build_and_apply_filters(query, kwd.get('date_range_min', None), lambda dmin: job_alias.table.c.update_time >= dmin)
-        query = build_and_apply_filters(query, kwd.get('date_range_max', None), lambda dmax: job_alias.table.c.update_time <= dmax)
+        query = build_and_apply_filters(query, kwd.get('date_range_min', None), lambda dmin: model.Job.update_time >= dmin)
+        query = build_and_apply_filters(query, kwd.get('date_range_max', None), lambda dmax: model.Job.update_time <= dmax)
 
         history_id = kwd.get('history_id', None)
         workflow_id = kwd.get('workflow_id', None)
         invocation_id = kwd.get('invocation_id', None)
         if history_id is not None:
             decoded_history_id = self.decode_id(history_id)
-            query = query.filter(job_alias.history_id == decoded_history_id)
+            query = query.filter(model.Job.history_id == decoded_history_id)
         if workflow_id or invocation_id:
-            invocation = aliased(model.WorkflowInvocation)
-            invocation_step = aliased(model.WorkflowInvocationStep)
             if workflow_id is not None:
                 decoded_workflow_id = self.decode_id(workflow_id)
-                query = query.filter(
-                    invocation.id == invocation_step.workflow_invocation_id,
-                    invocation.workflow_id == model.Workflow.table.c.id,
-                    model.Workflow.table.c.stored_workflow_id == decoded_workflow_id,
-                )
+                wfi_step = trans.sa_session.query(model.WorkflowInvocationStep).join(model.WorkflowInvocation).join(model.Workflow).filter(
+                    model.Workflow.stored_workflow_id == decoded_workflow_id,
+                ).subquery()
             elif invocation_id is not None:
                 decoded_invocation_id = self.decode_id(invocation_id)
-                query = query.filter(
-                    invocation.id == invocation_step.workflow_invocation_id,
-                    invocation_step.workflow_invocation_id == decoded_invocation_id
-                )
-            query = query.filter(
-                or_(
-                    job_alias.id == invocation_step.job_id,
-                    and_(
-                        job_alias.id == model.ImplicitCollectionJobsJobAssociation.table.c.job_id,
-                        model.ImplicitCollectionJobsJobAssociation.table.c.implicit_collection_jobs_id == invocation_step.implicit_collection_jobs_id,
-                    )
-                )
+                wfi_step = trans.sa_session.query(model.WorkflowInvocationStep).filter(
+                    model.WorkflowInvocationStep.workflow_invocation_id == decoded_invocation_id
+                ).subquery()
+            query1 = query.join(wfi_step)
+            query2 = query.join(model.ImplicitCollectionJobsJobAssociation).join(
+                wfi_step,
+                model.ImplicitCollectionJobsJobAssociation.implicit_collection_jobs_id == wfi_step.c.implicit_collection_jobs_id
             )
+            query = query1.union(query2)
 
         if kwd.get('order_by') == 'create_time':
-            order_by = job_alias.create_time.desc()
+            order_by = model.Job.create_time.desc()
         else:
-            order_by = job_alias.update_time.desc()
+            order_by = model.Job.update_time.desc()
         query = query.order_by(order_by)
 
         query = query.offset(offset)
diff --git a/lib/galaxy/webapps/galaxy/api/library_contents.py b/lib/galaxy/webapps/galaxy/api/library_contents.py
index 7237cfd4ee7..6e62e4096a2 100644
--- a/lib/galaxy/webapps/galaxy/api/library_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/library_contents.py
@@ -29,7 +29,6 @@ from galaxy.webapps.base.controller import (
     HTTPBadRequest,
     url_for,
     UsesFormDefinitionsMixin,
-    UsesLibraryMixin,
     UsesLibraryMixinItems
 )
 from . import BaseGalaxyAPIController
@@ -37,7 +36,7 @@ from . import BaseGalaxyAPIController
 log = logging.getLogger(__name__)
 
 
-class LibraryContentsController(BaseGalaxyAPIController, UsesLibraryMixin, UsesLibraryMixinItems, UsesFormDefinitionsMixin, LibraryActions):
+class LibraryContentsController(BaseGalaxyAPIController, UsesLibraryMixinItems, UsesFormDefinitionsMixin, LibraryActions):
 
     def __init__(self, app: StructuredApp, hda_manager: managers.hdas.HDAManager):
         super().__init__(app)
diff --git a/lib/galaxy/webapps/galaxy/api/page_revisions.py b/lib/galaxy/webapps/galaxy/api/page_revisions.py
index e8cebb69c41..2ef7ba8d2a7 100644
--- a/lib/galaxy/webapps/galaxy/api/page_revisions.py
+++ b/lib/galaxy/webapps/galaxy/api/page_revisions.py
@@ -5,18 +5,13 @@ import logging
 
 from galaxy.managers.base import get_object
 from galaxy.managers.pages import PageManager
-from galaxy.model.item_attrs import UsesAnnotations
 from galaxy.web import expose_api
-from galaxy.webapps.base.controller import (
-    SharableItemSecurityMixin,
-    SharableMixin
-)
 from . import BaseGalaxyAPIController, depends
 
 log = logging.getLogger(__name__)
 
 
-class PageRevisionsController(BaseGalaxyAPIController, SharableItemSecurityMixin, UsesAnnotations, SharableMixin):
+class PageRevisionsController(BaseGalaxyAPIController):
     manager: PageManager = depends(PageManager)
 
     @expose_api
diff --git a/lib/galaxy/webapps/galaxy/api/pages.py b/lib/galaxy/webapps/galaxy/api/pages.py
index 831ab9fcb1e..bd1bd2e6bb6 100644
--- a/lib/galaxy/webapps/galaxy/api/pages.py
+++ b/lib/galaxy/webapps/galaxy/api/pages.py
@@ -16,11 +16,11 @@ from galaxy.managers.context import ProvidesUserContext
 from galaxy.managers.pages import (
     CreatePagePayload,
     PageDetails,
-    PageSerializer,
-    PagesManager,
+    PagesService,
     PageSummary,
     PageSummaryList,
 )
+from galaxy.managers.sharable import SharingPayload, SharingStatus
 from galaxy.schema.fields import EncodedDatabaseIdField
 from galaxy.web import (
     expose_api,
@@ -53,7 +53,7 @@ PageIdPathParam: EncodedDatabaseIdField = Path(
 
 @router.cbv
 class FastAPIPages:
-    manager: PagesManager = depends(PagesManager)
+    service: PagesService = depends(PagesService)
 
     @router.get(
         '/api/pages',
@@ -66,7 +66,7 @@ class FastAPIPages:
         deleted: bool = DeletedQueryParam,
     ) -> PageSummaryList:
         """Get a list with summary information of all Pages available to the user."""
-        return self.manager.index(trans, deleted)
+        return self.service.index(trans, deleted)
 
     @router.post(
         '/api/pages',
@@ -79,7 +79,7 @@ class FastAPIPages:
         payload: CreatePagePayload = Body(...),
     ) -> PageSummary:
         """Get a list with details of all Pages available to the user."""
-        return self.manager.create(trans, payload)
+        return self.service.create(trans, payload)
 
     @router.delete(
         '/api/pages/{id}',
@@ -92,7 +92,7 @@ class FastAPIPages:
         id: EncodedDatabaseIdField = PageIdPathParam,
     ):
         """Marks the Page with the given ID as deleted."""
-        self.manager.delete(trans, id)
+        self.service.delete(trans, id)
 
     @router.get(
         '/api/pages/{id}',
@@ -105,7 +105,7 @@ class FastAPIPages:
         id: EncodedDatabaseIdField = PageIdPathParam,
     ) -> PageDetails:
         """Return summary information about a specific Page and the content of the last revision."""
-        return self.manager.show(trans, id)
+        return self.service.show(trans, id)
 
     @router.get(
         '/api/pages/{id}.pdf',
@@ -130,16 +130,40 @@ class FastAPIPages:
 
         This feature may not be available in this Galaxy.
         """
-        pdf_bytes = self.manager.show_pdf(trans, id)
+        pdf_bytes = self.service.show_pdf(trans, id)
         return StreamingResponse(io.BytesIO(pdf_bytes), media_type="application/pdf")
 
+    @router.get(
+        '/api/pages/{id}/sharing',
+        summary="Get sharing the status of the given Page.",
+    )
+    def get_sharing(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        id: EncodedDatabaseIdField = PageIdPathParam,
+    ) -> SharingStatus:
+        """Return the sharing status of the Page."""
+        return self.service.sharing(trans, id)
+
+    @router.post(
+        '/api/pages/{id}/sharing',
+        summary="Set sharing options for the given Page.",
+    )
+    def post_sharing(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        id: EncodedDatabaseIdField = PageIdPathParam,
+        payload: SharingPayload = Body(...),
+    ) -> SharingStatus:
+        """Return the sharing status of the Page after the changes."""
+        return self.service.sharing(trans, id, payload)
+
 
 class PagesController(BaseGalaxyAPIController):
     """
     RESTful controller for interactions with pages.
     """
-    manager: PagesManager = depends(PagesManager)
-    serializer: PageSerializer = depends(PageSerializer)
+    service: PagesService = depends(PagesService)
 
     @expose_api_anonymous_and_sessionless
     def index(self, trans, deleted=False, **kwd):
@@ -153,7 +177,7 @@ class PagesController(BaseGalaxyAPIController):
         :rtype:     list
         :returns:   dictionaries containing summary or detailed Page information
         """
-        return self.manager.index(trans, deleted)
+        return self.service.index(trans, deleted)
 
     @expose_api
     def create(self, trans, payload, **kwd):
@@ -172,7 +196,7 @@ class PagesController(BaseGalaxyAPIController):
         :rtype:     dict
         :returns:   Dictionary return of the Page.to_dict call
         """
-        return self.manager.create(trans, CreatePagePayload(**payload))
+        return self.service.create(trans, CreatePagePayload(**payload))
 
     @expose_api
     def delete(self, trans, id, **kwd):
@@ -186,7 +210,7 @@ class PagesController(BaseGalaxyAPIController):
         :rtype:     dict
         :returns:   Dictionary with 'success' or 'error' element to indicate the result of the request
         """
-        self.manager.delete(trans, id)
+        self.service.delete(trans, id)
         trans.response.status = 204
 
     @expose_api_anonymous_and_sessionless
@@ -201,7 +225,7 @@ class PagesController(BaseGalaxyAPIController):
         :rtype:     dict
         :returns:   Dictionary return of the Page.to_dict call with the 'content' field populated by the most recent revision
         """
-        return self.manager.show(trans, id)
+        return self.service.show(trans, id)
 
     @expose_api_raw_anonymous_and_sessionless
     def show_pdf(self, trans, id, **kwd):
@@ -215,4 +239,14 @@ class PagesController(BaseGalaxyAPIController):
         :rtype: dict
         :returns: Dictionary return of the Page.to_dict call with the 'content' field populated by the most recent revision
         """
-        return self.manager.show_pdf(trans, id)
+        return self.service.show_pdf(trans, id)
+
+    @expose_api
+    def sharing(self, trans, id, payload=None, **kwd):
+        """
+        * GET/POST /api/pages/{id}/sharing
+            View/modify sharing options for the page with the given id.
+        """
+        if payload:
+            payload = SharingPayload(**payload)
+        return self.service.sharing(trans, id, payload)
diff --git a/lib/galaxy/webapps/galaxy/api/remote_files.py b/lib/galaxy/webapps/galaxy/api/remote_files.py
index 86550c380d7..927a9d5f61b 100644
--- a/lib/galaxy/webapps/galaxy/api/remote_files.py
+++ b/lib/galaxy/webapps/galaxy/api/remote_files.py
@@ -36,11 +36,12 @@ TargetQueryParam: str = Query(
 )
 
 FormatQueryParam: Optional[RemoteFilesFormat] = Query(
-    default=RemoteFilesFormat.flat,
+    default=RemoteFilesFormat.uri,
     title="Response format",
     description=(
         "The requested format of returned data. Either `flat` to simply list all the files"
-        " or `jstree` to get a tree representation of the files."
+        ", `jstree` to get a tree representation of the files, or the default `uri` to list "
+        "files and directories by their URI."
     ),
 )
 
diff --git a/lib/galaxy/webapps/galaxy/api/visualizations.py b/lib/galaxy/webapps/galaxy/api/visualizations.py
index de633671b20..2eb158df9f3 100644
--- a/lib/galaxy/webapps/galaxy/api/visualizations.py
+++ b/lib/galaxy/webapps/galaxy/api/visualizations.py
@@ -13,14 +13,11 @@ from galaxy import (
     util,
     web
 )
-from galaxy.managers.visualizations import (
-    VisualizationManager,
-    VisualizationSerializer
-)
+from galaxy.managers.sharable import SharingPayload
+from galaxy.managers.visualizations import VisualizationsService
 from galaxy.model.item_attrs import UsesAnnotations
 from galaxy.web import expose_api
 from galaxy.webapps.base.controller import (
-    SharableMixin,
     UsesVisualizationMixin
 )
 from galaxy.webapps.base.webapp import GalaxyWebTransaction
@@ -29,12 +26,11 @@ from . import BaseGalaxyAPIController, depends
 log = logging.getLogger(__name__)
 
 
-class VisualizationsController(BaseGalaxyAPIController, UsesVisualizationMixin, SharableMixin, UsesAnnotations):
+class VisualizationsController(BaseGalaxyAPIController, UsesVisualizationMixin, UsesAnnotations):
     """
     RESTful controller for interactions with visualizations.
     """
-    manager: VisualizationManager = depends(VisualizationManager)
-    serializer: VisualizationSerializer = depends(VisualizationSerializer)
+    service: VisualizationsService = depends(VisualizationsService)
 
     @expose_api
     def index(self, trans: GalaxyWebTransaction, **kwargs):
@@ -155,6 +151,16 @@ class VisualizationsController(BaseGalaxyAPIController, UsesVisualizationMixin,
 
         return rval
 
+    @expose_api
+    def sharing(self, trans, id, payload=None, **kwd):
+        """
+        * GET/POST /api/pages/{id}/sharing
+            View/modify sharing options for the page with the given id.
+        """
+        if payload:
+            payload = SharingPayload(**payload)
+        return self.service.sharing(trans, id, payload)
+
     def _validate_and_parse_payload(self, payload):
         """
         Validate and parse incomming data payload for a visualization.
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index 01c4a1a0cc8..378e1b9bb4b 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -2465,6 +2465,16 @@ mapping:
           are expunged from the SQL alchemy session between workflow invocation scheduling iterations.
           Set to -1 to disable any such maximum.
 
+      flush_per_n_datasets:
+        type: int
+        default: 1000
+        required: false
+        desc: |
+          Maximum number of datasets to create before flushing created datasets to database.
+          This affects tools that create many output datasets.
+          Higher values will lead to fewer database flushes and faster execution, but require
+          more memory. Set to -1 to disable creating datasets in batches.
+
       history_local_serial_workflow_scheduling:
         type: bool
         default: false
@@ -3173,6 +3183,15 @@ mapping:
           will automatically create and use a separate sqlite database located in your
           <galaxy>/database folder (indicated in the commented out line below).
 
+      enable_celery_tasks:
+        type: bool
+        default: false
+        required: false
+        desc: |
+          Offload long-running tasks to a Celery task queue.
+          Activate this only if you have setup a Celery worker for Galaxy.
+          For details, see https://docs.galaxyproject.org/en/master/admin/production.html
+
       use_pbkdf2:
         type: bool
         default: true
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
index 4fff41f3d33..c836bb1efe0 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -109,12 +109,12 @@ class UserListGrid(grids.Grid):
                        filterable="advanced"),
         LastLoginColumn("Last Login", format=time_ago),
         DiskUsageColumn("Disk Usage", key="disk_usage", attach_popup=False),
-        StatusColumn("Status", attach_popup=False),
-        TimeCreatedColumn("Created", attach_popup=False),
-        ActivatedColumn("Activated", attach_popup=False),
+        StatusColumn("Status", attach_popup=False, key="deleted"),
+        TimeCreatedColumn("Created", attach_popup=False, key="create_time"),
+        ActivatedColumn("Activated", attach_popup=False, key="active"),
         GroupsColumn("Groups", attach_popup=False),
         RolesColumn("Roles", attach_popup=False),
-        ExternalColumn("External", attach_popup=False),
+        ExternalColumn("External", attach_popup=False, key="external"),
         # Columns that are valid for filtering but are not visible.
         grids.DeletedColumn("Deleted", key="deleted", visible=False, filterable="advanced"),
         grids.PurgedColumn("Purged", key="purged", visible=False, filterable="advanced")
diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 24734b0047d..96dba4ba74f 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -18,6 +18,7 @@ from galaxy import exceptions
 from galaxy import model
 from galaxy import web
 from galaxy.managers import histories
+from galaxy.managers.sharable import SlugBuilder
 from galaxy.model.item_attrs import (
     UsesAnnotations,
     UsesItemRatings
@@ -240,6 +241,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
     history_manager: histories.HistoryManager = depends(histories.HistoryManager)
     history_export_view: histories.HistoryExportView = depends(histories.HistoryExportView)
     history_serializer: histories.HistorySerializer = depends(histories.HistorySerializer)
+    slug_builder: SlugBuilder = depends(SlugBuilder)
 
     def __init__(self, app: StructuredApp):
         super().__init__(app)
@@ -1040,7 +1042,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
                     share.history = history
                     share.user = send_to_user
                     trans.sa_session.add(share)
-                    self.create_item_slug(trans.sa_session, history)
+                    self.slug_builder.create_item_slug(trans.sa_session, history)
                     trans.sa_session.flush()
                     if history not in shared_histories:
                         shared_histories.append(history)
@@ -1113,7 +1115,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
     def get_name_and_link_async(self, trans, id=None):
         """ Returns history's name and link. """
         history = self.history_manager.get_accessible(self.decode_id(id), trans.user, current_history=trans.history)
-        if self.create_item_slug(trans.sa_session, history):
+        if self.slug_builder.create_item_slug(trans.sa_session, history):
             trans.sa_session.flush()
         return_dict = {
             "name": history.name,
diff --git a/lib/galaxy/webapps/galaxy/controllers/page.py b/lib/galaxy/webapps/galaxy/controllers/page.py
index 25c79ae4477..a04113bcc01 100644
--- a/lib/galaxy/webapps/galaxy/controllers/page.py
+++ b/lib/galaxy/webapps/galaxy/controllers/page.py
@@ -23,6 +23,7 @@ from galaxy.managers.pages import (
     PageContentProcessor,
     PageManager,
 )
+from galaxy.managers.sharable import SlugBuilder
 from galaxy.managers.workflows import WorkflowsManager
 from galaxy.model.item_attrs import UsesItemRatings
 from galaxy.structured_app import StructuredApp
@@ -276,6 +277,7 @@ class PageController(BaseUIController, SharableMixin,
     history_serializer: HistorySerializer = depends(HistorySerializer)
     hda_manager: HDAManager = depends(HDAManager)
     workflow_manager: WorkflowsManager = depends(WorkflowsManager)
+    slug_builder: SlugBuilder = depends(SlugBuilder)
 
     def __init__(self, app: StructuredApp):
         super().__init__(app)
@@ -394,7 +396,7 @@ class PageController(BaseUIController, SharableMixin,
         p = trans.sa_session.query(model.Page).get(decoded_id)
         if trans.request.method == 'GET':
             if p.slug is None:
-                self.create_item_slug(trans.sa_session, p)
+                self.slug_builder.create_item_slug(trans.sa_session, p)
             return {
                 'title': 'Edit page attributes',
                 'inputs': [{
@@ -470,7 +472,7 @@ class PageController(BaseUIController, SharableMixin,
                 share.user = other
                 session = trans.sa_session
                 session.add(share)
-                self.create_item_slug(session, page)
+                self.slug_builder.create_item_slug(session, page)
                 session.flush()
                 page_title = escape(page.title)
                 other_email = escape(other.email)
@@ -581,7 +583,7 @@ class PageController(BaseUIController, SharableMixin,
         """ Returns page's name and link. """
         page = self.get_page(trans, id)
 
-        if self.create_item_slug(trans.sa_session, page):
+        if self.slug_builder.create_item_slug(trans.sa_session, page):
             trans.sa_session.flush()
         return_dict = {"name": page.title, "link": url_for(controller='page',
                                                            action="display_by_username_and_slug",
diff --git a/lib/galaxy/webapps/galaxy/controllers/user.py b/lib/galaxy/webapps/galaxy/controllers/user.py
index e1749d5d790..ffba90b02ab 100644
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -222,11 +222,15 @@ class User(BaseUIController, UsesFormDefinitionsMixin, CreatesApiKeysMixin):
         if message:
             return self.message_exception(trans, message)
         if trans.user:
-            # Queue a quota recalculation (async) task -- this takes a
-            # while sometimes, so we don't want to block on logout.
-            send_local_control_task(trans.app,
-                                    "recalculate_user_disk_usage",
-                                    kwargs={"user_id": trans.security.encode_id(trans.user.id)})
+            if trans.app.config.enable_celery_tasks:
+                # Queue a quota recalculation (async) task -- this takes a
+                # while sometimes, so we don't want to block on logout.
+                from galaxy.celery.tasks import recalculate_user_disk_usage
+                recalculate_user_disk_usage.delay(user_id=trans.user.id)
+            else:
+                send_local_control_task(trans.app,
+                                        "recalculate_user_disk_usage",
+                                        kwargs={"user_id": trans.security.encode_id(trans.user.id)})
         # Since logging an event requires a session, we'll log prior to ending the session
         trans.log_event("User logged out")
         trans.handle_user_logout(logout_all=logout_all)
diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py
index 74dfa7f94e9..0a558709a33 100644
--- a/lib/galaxy/webapps/galaxy/controllers/visualization.py
+++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py
@@ -21,6 +21,7 @@ from sqlalchemy.orm import eagerload, undefer
 from galaxy import model, util, web
 from galaxy.datatypes.interval import Bed
 from galaxy.managers.hdas import HDAManager
+from galaxy.managers.sharable import SlugBuilder
 from galaxy.model.item_attrs import UsesAnnotations, UsesItemRatings
 from galaxy.structured_app import StructuredApp
 from galaxy.util import sanitize_text, unicodify
@@ -235,6 +236,7 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
     _library_datasets_grid = LibraryDatasetsSelectionGrid()
     _tracks_grid = TracksterSelectionGrid()
     hda_manager: HDAManager = depends(HDAManager)
+    slug_builder: SlugBuilder = depends(SlugBuilder)
 
     def __init__(self, app: StructuredApp):
         super().__init__(app)
@@ -439,7 +441,7 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
                 share.user = other
                 session = trans.sa_session
                 session.add(share)
-                self.create_item_slug(session, visualization)
+                self.slug_builder.create_item_slug(session, visualization)
                 session.flush()
                 viz_title = escape(visualization.title)
                 other_email = escape(other.email)
@@ -500,7 +502,7 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
         """ Returns visualization's name and link. """
         visualization = self.get_visualization(trans, id, check_ownership=False, check_accessible=True)
 
-        if self.create_item_slug(trans.sa_session, visualization):
+        if self.slug_builder.create_item_slug(trans.sa_session, visualization):
             trans.sa_session.flush()
         return_dict = {"name": visualization.title,
                        "link": web.url_for(controller='visualization', action="display_by_username_and_slug", username=visualization.user.username, slug=visualization.slug)}
@@ -548,7 +550,7 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
         v = self.get_visualization(trans, id, check_ownership=True)
         if trans.request.method == 'GET':
             if v.slug is None:
-                self.create_item_slug(trans.sa_session, v)
+                self.slug_builder.create_item_slug(trans.sa_session, v)
             return {
                 'title': 'Edit visualization attributes',
                 'inputs': [{
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index f2d2e04e7ca..6c2d5bf06bb 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -14,6 +14,7 @@ from galaxy import (
     util,
     web
 )
+from galaxy.managers.sharable import SlugBuilder
 from galaxy.managers.workflows import (
     MissingToolsException,
     WorkflowUpdateOptions,
@@ -181,6 +182,7 @@ class SingleTagContentsParser(HTMLParser):
 class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixin, UsesItemRatings):
     stored_list_grid = StoredWorkflowListGrid()
     published_list_grid = StoredWorkflowAllPublishedGrid()
+    slug_builder = SlugBuilder()
 
     @web.expose
     @web.require_login("use Galaxy workflows")
@@ -564,7 +566,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
             stored_workflow = model.StoredWorkflow()
             stored_workflow.name = workflow_name
             stored_workflow.user = user
-            self.create_item_slug(trans.sa_session, stored_workflow)
+            self.slug_builder.create_item_slug(trans.sa_session, stored_workflow)
             # And the first (empty) workflow revision
             workflow = model.Workflow()
             workflow.name = workflow_name
@@ -591,7 +593,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
             stored_workflow = model.StoredWorkflow()
             stored_workflow.name = workflow_name
             stored_workflow.user = user
-            self.create_item_slug(trans.sa_session, stored_workflow)
+            self.slug_builder.create_item_slug(trans.sa_session, stored_workflow)
             workflow = model.Workflow()
             workflow.name = workflow_name
             workflow.stored_workflow = stored_workflow
@@ -720,7 +722,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
             'id': trans.security.encode_id(stored.id),
             'name': stored.name,
             'tags': item_tag_names,
-            'version': version,
+            'initialVersion': version,
             'annotation': self.get_item_annotation_str(trans.sa_session, trans.user, stored),
             'toolbox': trans.app.toolbox.to_dict(trans),
             'moduleSections': module_sections,
diff --git a/lib/galaxy/workflow/refactor/schema.py b/lib/galaxy/workflow/refactor/schema.py
index b5b62553e55..a4ca1800242 100644
--- a/lib/galaxy/workflow/refactor/schema.py
+++ b/lib/galaxy/workflow/refactor/schema.py
@@ -241,7 +241,14 @@ union_action_classes = Union[
 
 ACTION_CLASSES_BY_TYPE = {}
 for action_class in union_action_classes.__args__:  # type: ignore
-    action_type = action_class.schema()["properties"]["action_type"]["const"]
+    action_type_def = action_class.schema()["properties"]["action_type"]
+    try:
+        # pydantic 1.8
+        action_type = action_type_def["enum"][0]
+    except KeyError:
+        # pydantic 1.7
+        action_type = action_type_def["const"]
+
     ACTION_CLASSES_BY_TYPE[action_type] = action_class
 
 
diff --git a/lib/galaxy_test/api/sharable.py b/lib/galaxy_test/api/sharable.py
new file mode 100644
index 00000000000..2bb77c0d26e
--- /dev/null
+++ b/lib/galaxy_test/api/sharable.py
@@ -0,0 +1,108 @@
+from typing import Any
+from unittest import SkipTest
+
+from galaxy_test.base.api import UsesApiTestCaseMixin
+
+
+class SharingApiTests(UsesApiTestCaseMixin):
+    """ Includes some tests for the sharing functionality of a particular resource type."""
+
+    # The api_name has to be set to the appropiate value in the class using these tests.
+    api_name: str
+
+    def create(self, name: str) -> str:
+        """Creates a shareable resource with the given name and returns it's ID.
+
+        :param name: The name of the shareable resource to create.
+        :type name: str
+        :return: The ID of the resource.
+        :rtype: str
+        """
+        raise SkipTest("Abstract")
+
+    def test_get_sharing_info(self):
+        resource_id = self.create("resource-to-share")
+        sharing_response = self._get_resource_sharing_info(resource_id)
+        self._assert_has_keys(sharing_response, "title", "importable", "id", "username_and_slug", "published", "users_shared_with")
+
+    def test_sharing_make_accessible_via_link(self):
+        resource_id = self.create("resource-to-make-accessible-via-link")
+
+        sharing_response = self._get_resource_sharing_info(resource_id)
+        assert sharing_response["importable"] is False
+
+        payload = {"action": "make_accessible_via_link"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+
+    def test_sharing_make_accessible_and_publish(self):
+        resource_id = self.create("resource-to-publish")
+
+        sharing_response = self._get_resource_sharing_info(resource_id)
+        assert sharing_response["importable"] is False
+        assert sharing_response["published"] is False
+
+        payload = {"action": "make_accessible_and_publish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+        assert sharing_response["published"] is True
+
+    def test_sharing_publish_not_accessible_raises_400(self):
+        resource_id = self.create("resource-to-publish-not-accesible")
+
+        sharing_response = self._get_resource_sharing_info(resource_id)
+        assert sharing_response["importable"] is False
+
+        payload = {"action": "publish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload, expect_response_status=400)
+
+    def test_sharing_disable_link_access(self):
+        resource_id = self.create("resource-to-disable-link-access")
+
+        payload = {"action": "make_accessible_via_link"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+
+        payload = {"action": "disable_link_access"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is False
+
+    def test_sharing_unpublish(self):
+        resource_id = self.create("resource-to-unpublish")
+
+        sharing_response = self._get_resource_sharing_info(resource_id)
+
+        payload = {"action": "make_accessible_and_publish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+        assert sharing_response["published"] is True
+
+        payload = {"action": "unpublish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+        assert sharing_response["published"] is False
+
+    def test_sharing_disable_link_access_and_unpublish(self):
+        resource_id = self.create("resource-to-disable-link-access-and-unpublish")
+
+        sharing_response = self._get_resource_sharing_info(resource_id)
+
+        payload = {"action": "make_accessible_and_publish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is True
+        assert sharing_response["published"] is True
+
+        payload = {"action": "disable_link_access_and_unpublish"}
+        sharing_response = self._set_resource_sharing(resource_id, payload)
+        assert sharing_response["importable"] is False
+        assert sharing_response["published"] is False
+
+    def _get_resource_sharing_info(self, resource_id: str):
+        sharing_response = self._get(f"{self.api_name}/{resource_id}/sharing")
+        self._assert_status_code_is(sharing_response, 200)
+        return sharing_response.json()
+
+    def _set_resource_sharing(self, resource_id: str, payload: Any, expect_response_status: int = 200):
+        sharing_response = self._post(f"{self.api_name}/{resource_id}/sharing", data=payload, json=True)
+        self._assert_status_code_is(sharing_response, expect_response_status)
+        return sharing_response.json()
diff --git a/lib/galaxy_test/api/test_folder_contents.py b/lib/galaxy_test/api/test_folder_contents.py
index b1c157b4aa0..8020d2ef466 100644
--- a/lib/galaxy_test/api/test_folder_contents.py
+++ b/lib/galaxy_test/api/test_folder_contents.py
@@ -22,8 +22,7 @@ class FolderContentsApiTestCase(ApiTestCase):
 
         self.history_id = self.dataset_populator.new_history()
         self.library = self.library_populator.new_private_library("FolderContentsTestsLibrary")
-        self.root_folder = self._create_folder_in_library("Test Folder Contents")
-        self.root_folder_id = self.root_folder["id"]
+        self.root_folder_id = self._create_folder_in_library("Test Folder Contents")
 
     def test_create_hda_with_ldda_message(self):
         hda_id = self._create_hda()
@@ -47,8 +46,7 @@ class FolderContentsApiTestCase(ApiTestCase):
         assert len(contents) == len(lddas)
 
     def test_index(self):
-        folder = self._create_folder_in_library("Test Folder Contents Index")
-        folder_id = folder["id"]
+        folder_id = self._create_folder_in_library("Test Folder Contents Index")
 
         self._create_dataset_in_folder(folder_id)
 
@@ -59,8 +57,7 @@ class FolderContentsApiTestCase(ApiTestCase):
 
     def test_index_include_deleted(self):
         folder_name = "Test Folder Contents Index include deleted"
-        folder = self._create_folder_in_library(folder_name)
-        folder_id = folder["id"]
+        folder_id = self._create_folder_in_library(folder_name)
 
         hda_id = self._create_dataset_in_folder(folder_id)
         self._delete_library_dataset(hda_id)
@@ -79,8 +76,7 @@ class FolderContentsApiTestCase(ApiTestCase):
 
     def test_index_limit_offset(self):
         folder_name = "Test Folder Contents Index limit"
-        folder = self._create_folder_in_library(folder_name)
-        folder_id = folder["id"]
+        folder_id = self._create_folder_in_library(folder_name)
 
         num_subfolders = 5
         for index in range(num_subfolders):
@@ -121,8 +117,7 @@ class FolderContentsApiTestCase(ApiTestCase):
 
     def test_index_search_text(self):
         folder_name = "Test Folder Contents Index search text"
-        folder = self._create_folder_in_library(folder_name)
-        folder_id = folder["id"]
+        folder_id = self._create_folder_in_library(folder_name)
 
         dataset_names = ["AB", "BC", "ABC"]
         for name in dataset_names:
@@ -142,11 +137,75 @@ class FolderContentsApiTestCase(ApiTestCase):
             matching_names = [name for name in all_names if search_text in name]
             assert len(contents) == len(matching_names)
 
+    def test_index_permissions_include_deleted(self):
+
+        folder_name = "Test Folder Contents Index permissions include deteleted"
+        folder_id = self._create_folder_in_library(folder_name)
+
+        num_subfolders = 5
+        subfolder_ids: List[str] = []
+        deleted_subfolder_ids: List[str] = []
+        for index in range(num_subfolders):
+            id = self._create_subfolder_in(folder_id, name=f"Folder_{index}")
+            subfolder_ids.append(id)
+
+        for index, subfolder_id in enumerate(subfolder_ids):
+            if index % 2 == 0:
+                self._delete_subfolder(subfolder_id)
+                deleted_subfolder_ids.append(subfolder_id)
+
+        num_datasets = 5
+        datasets_ids: List[str] = []
+        deleted_datasets_ids: List[str] = []
+        for _ in range(num_datasets):
+            id = self._create_dataset_in_folder(folder_id)
+            datasets_ids.append(id)
+
+        for index, ldda_id in enumerate(datasets_ids):
+            if index % 2 == 0:
+                self._delete_library_dataset(ldda_id)
+                deleted_datasets_ids.append(ldda_id)
+
+        num_total_contents = num_subfolders + num_datasets
+        num_non_deleted = num_total_contents - len(deleted_subfolder_ids) - len(deleted_datasets_ids)
+
+        # Verify deleted contents are not listed
+        include_deleted = False
+        response = self._get(f"folders/{folder_id}/contents?include_deleted={include_deleted}")
+        self._assert_status_code_is(response, 200)
+        contents = response.json()["folder_contents"]
+        assert len(contents) == num_non_deleted
+
+        include_deleted = True
+        # Admins can see everything...
+        response = self._get(f"folders/{folder_id}/contents?include_deleted={include_deleted}", admin=True)
+        self._assert_status_code_is(response, 200)
+        contents = response.json()["folder_contents"]
+        assert len(contents) == num_total_contents
+
+        # Owner can see everything too
+        response = self._get(f"folders/{folder_id}/contents?include_deleted={include_deleted}")
+        self._assert_status_code_is(response, 200)
+        contents = response.json()["folder_contents"]
+        assert len(contents) == num_total_contents
+
+        # Users with access but no modify permission can't see deleted
+        with self._different_user():
+            different_user_role_id = self.dataset_populator.user_private_role_id()
+
+        self._allow_library_access_to_user_role(different_user_role_id)
+
+        with self._different_user():
+            response = self._get(f"folders/{folder_id}/contents?include_deleted={include_deleted}")
+            self._assert_status_code_is(response, 200)
+            contents = response.json()["folder_contents"]
+            assert len(contents) == num_non_deleted
+
     def _create_folder_in_library(self, name: str) -> Any:
         root_folder_id = self.library["root_folder_id"]
         return self._create_subfolder_in(root_folder_id, name)
 
-    def _create_subfolder_in(self, folder_id: str, name: str) -> Any:
+    def _create_subfolder_in(self, folder_id: str, name: str) -> str:
         data = {
             "name": name,
             "description": f"The description of {name}",
@@ -154,7 +213,7 @@ class FolderContentsApiTestCase(ApiTestCase):
         create_response = self._post(f"folders/{folder_id}", data=data)
         self._assert_status_code_is(create_response, 200)
         folder = create_response.json()
-        return folder
+        return folder["id"]
 
     def _create_dataset_in_folder(self, folder_id: str, name: Optional[str] = None) -> str:
         hda_id = self._create_hda(name)
@@ -180,5 +239,18 @@ class FolderContentsApiTestCase(ApiTestCase):
         return hdca_id
 
     def _delete_library_dataset(self, ldda_id: str) -> None:
-        delete_response = self._delete(f"libraries/datasets/{ldda_id}", admin=True)
+        delete_response = self._delete(f"libraries/datasets/{ldda_id}")
         self._assert_status_code_is(delete_response, 200)
+
+    def _delete_subfolder(self, folder_id: str) -> None:
+        delete_response = self._delete(f"folders/{folder_id}")
+        self._assert_status_code_is(delete_response, 200)
+
+    def _allow_library_access_to_user_role(self, role_id: str):
+        library_id = self.library["id"]
+        action = "set_permissions"
+        data = {
+            "access_ids[]": role_id,
+        }
+        response = self._post(f"libraries/{library_id}/permissions?action={action}", data=data, admin=True)
+        self._assert_status_code_is(response, 200)
diff --git a/lib/galaxy_test/api/test_folders.py b/lib/galaxy_test/api/test_folders.py
new file mode 100644
index 00000000000..e709ae58e78
--- /dev/null
+++ b/lib/galaxy_test/api/test_folders.py
@@ -0,0 +1,150 @@
+from galaxy_test.base.populators import LibraryPopulator
+from ._framework import ApiTestCase
+
+
+class FoldersApiTestCase(ApiTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.library_populator = LibraryPopulator(self.galaxy_interactor)
+        self.library = self.library_populator.new_library("FolderTestsLibrary")
+
+    def test_create(self):
+        folder = self._create_folder("Test Create Folder")
+        self._assert_valid_folder(folder)
+
+    def test_create_without_name_raises_400(self):
+        root_folder_id = self.library["root_folder_id"]
+        data = {
+            "description": "Description only",
+        }
+        create_response = self._post(f"folders/{root_folder_id}", data=data, admin=True)
+        self._assert_status_code_is(create_response, 400)
+
+    def test_permissions(self):
+        folder = self._create_folder("Test Permissions Folder")
+        folder_id = folder["id"]
+
+        empty_permissions = self._get_permissions(folder_id)
+        self._assert_permissions_empty(empty_permissions)
+
+        role_id = self.library_populator.user_private_role_id()
+        action = "set_permissions"
+        data = {
+            "add_ids[]": [role_id],
+            "manage_ids[]": role_id,  # string-lists also supported
+            "modify_ids[]": [role_id]
+        }
+        response = self._post(f"folders/{folder_id}/permissions?action={action}", data=data, admin=True)
+        self._assert_status_code_is(response, 200)
+        new_permissions = response.json()
+
+        permissions = self._get_permissions(folder_id)
+        assert permissions == new_permissions
+        self._assert_permissions_contains_role(permissions, role_id)
+
+    def test_update(self):
+        folder = self._create_folder("Test Update Folder")
+        folder_id = folder["id"]
+        updated_name = "UPDATED"
+        updated_desc = "UPDATED DESCRIPTION"
+        data = {
+            "name": updated_name,
+            "description": updated_desc,
+        }
+        patch_response = self._patch(f"folders/{folder_id}", data=data, admin=True)
+        self._assert_status_code_is(patch_response, 200)
+        updated_folder = patch_response.json()
+        self._assert_valid_folder(updated_folder)
+        assert updated_folder["name"] == updated_name
+        assert updated_folder["description"] == updated_desc
+
+    def test_delete(self):
+        folder = self._create_folder("Test Delete Folder")
+        folder_id = folder["id"]
+
+        deleted_folder = self._delete_folder(folder_id)
+        assert deleted_folder["deleted"] is True
+
+    def test_undelete(self):
+        folder = self._create_folder("Test Undelete Folder")
+        folder_id = folder["id"]
+
+        deleted_folder = self._delete_folder(folder_id)
+        assert deleted_folder["deleted"] is True
+
+        undelete = True
+        undelete_response = self._delete(f"folders/{folder_id}?undelete={undelete}", admin=True)
+        self._assert_status_code_is(undelete_response, 200)
+        undeleted_folder = undelete_response.json()
+        assert undeleted_folder["deleted"] is False
+
+    def test_update_deleted_raise_403(self):
+        folder = self._create_folder("Test Update Deleted Folder")
+        folder_id = folder["id"]
+
+        deleted_folder = self._delete_folder(folder_id)
+        assert deleted_folder["deleted"] is True
+
+        data = {
+            "name": "test",
+        }
+        patch_response = self._patch(f"folders/{folder_id}", data=data, admin=True)
+        self._assert_status_code_is(patch_response, 403)
+
+    def _create_folder(self, name: str):
+        root_folder_id = self.library["root_folder_id"]
+        data = {
+            "name": name,
+            "description": f"The description of {name}",
+        }
+        create_response = self._post(f"folders/{root_folder_id}", data=data, admin=True)
+        self._assert_status_code_is(create_response, 200)
+        folder = create_response.json()
+        return folder
+
+    def _delete_folder(self, folder_id):
+        delete_response = self._delete(f"folders/{folder_id}", admin=True)
+        self._assert_status_code_is(delete_response, 200)
+        deleted_folder = delete_response.json()
+        return deleted_folder
+
+    def _get_permissions(self, folder_id):
+        response = self._get(f"folders/{folder_id}/permissions", admin=True)
+        self._assert_status_code_is(response, 200)
+        permissions = response.json()
+        self._assert_valid_permissions(permissions)
+        return permissions
+
+    def _assert_valid_folder(self, folder):
+        self._assert_has_keys(
+            folder,
+            "id",
+            "name",
+            "model_class",
+            "parent_id",
+            "item_count",
+            "genome_build",
+            "update_time",
+            "deleted",
+            "library_path",
+            "parent_library_id"
+        )
+
+    def _assert_valid_permissions(self, permissions):
+        self._assert_has_keys(
+            permissions,
+            "modify_folder_role_list",
+            "manage_folder_role_list",
+            "add_library_item_role_list",
+        )
+
+    def _assert_permissions_empty(self, permissions):
+        assert permissions["modify_folder_role_list"] == []
+        assert permissions["manage_folder_role_list"] == []
+        assert permissions["add_library_item_role_list"] == []
+
+    def _assert_permissions_contains_role(self, permissions, role_id):
+        assert role_id in permissions["modify_folder_role_list"][0]
+        assert role_id in permissions["manage_folder_role_list"][0]
+        assert role_id in permissions["add_library_item_role_list"][0]
diff --git a/lib/galaxy_test/api/test_histories.py b/lib/galaxy_test/api/test_histories.py
index cb2a60caf38..8a6530f6c31 100644
--- a/lib/galaxy_test/api/test_histories.py
+++ b/lib/galaxy_test/api/test_histories.py
@@ -5,6 +5,7 @@ from requests import (
     put
 )
 
+from galaxy_test.api.sharable import SharingApiTests
 from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
@@ -31,7 +32,13 @@ class BaseHistories:
         return create_response
 
 
-class HistoriesApiTestCase(ApiTestCase, BaseHistories):
+class HistoriesApiTestCase(ApiTestCase, BaseHistories, SharingApiTests):
+
+    api_name = "histories"
+
+    def create(self, name: str) -> str:
+        response_json = self._create_history(name)
+        return response_json["id"]
 
     def test_create_history(self):
         # Create a history.
diff --git a/lib/galaxy_test/api/test_history_contents.py b/lib/galaxy_test/api/test_history_contents.py
index da1908c5692..afa8ee74c03 100644
--- a/lib/galaxy_test/api/test_history_contents.py
+++ b/lib/galaxy_test/api/test_history_contents.py
@@ -440,6 +440,18 @@ class HistoryContentsApiTestCase(ApiTestCase):
         self._assert_has_keys(new_forward, "history_id")
         assert new_forward["history_id"] == self.history_id
 
+    def test_hdca_copy_with_new_dbkey(self):
+        hdca = self.dataset_collection_populator.create_pair_in_history(self.history_id).json()
+        hdca_id = hdca["id"]
+        assert hdca["elements"][0]["object"]["metadata_dbkey"] == "?"
+        assert hdca["elements"][0]["object"]["genome_build"] == "?"
+        create_data = {'source': 'hdca', 'content': hdca_id, 'dbkey': 'hg19'}
+        create_response = self._post(f"histories/{self.history_id}/contents/dataset_collections", create_data)
+        collection = self.__check_create_collection_response(create_response)
+        new_forward = collection['elements'][0]['object']
+        assert new_forward["metadata_dbkey"] == "hg19"
+        assert new_forward["genome_build"] == "hg19"
+
     def test_hdca_copy_and_elements(self):
         hdca = self.dataset_collection_populator.create_pair_in_history(self.history_id).json()
         hdca_id = hdca["id"]
diff --git a/lib/galaxy_test/api/test_jobs.py b/lib/galaxy_test/api/test_jobs.py
index 9a0808d6906..9b1ce7215d0 100644
--- a/lib/galaxy_test/api/test_jobs.py
+++ b/lib/galaxy_test/api/test_jobs.py
@@ -40,7 +40,7 @@ class JobsApiTestCase(ApiTestCase, TestsTools):
         self.__history_with_new_dataset(history_id)
         jobs = self.__jobs_index(admin=False)
         job = jobs[0]
-        self._assert_not_has_keys(job, "command_line", "external_id")
+        self._assert_not_has_keys(job, "external_id")
 
         jobs = self.__jobs_index(admin=True)
         job = jobs[0]
@@ -71,7 +71,7 @@ class JobsApiTestCase(ApiTestCase, TestsTools):
     @uses_test_history(require_new=True)
     def test_index_date_filter(self, history_id):
         self.__history_with_new_dataset(history_id)
-        two_weeks_ago = (datetime.datetime.utcnow() - datetime.timedelta(7)).isoformat()
+        two_weeks_ago = (datetime.datetime.utcnow() - datetime.timedelta(14)).isoformat()
         last_week = (datetime.datetime.utcnow() - datetime.timedelta(7)).isoformat()
         next_week = (datetime.datetime.utcnow() + datetime.timedelta(7)).isoformat()
         today = datetime.datetime.utcnow().isoformat()
@@ -226,7 +226,7 @@ steps:
         assert not job_lock_response.json()["active"]
 
         show_jobs_response = self._get("jobs/%s" % job_id, admin=False)
-        self._assert_not_has_keys(show_jobs_response.json(), "command_line", "external_id")
+        self._assert_not_has_keys(show_jobs_response.json(), "external_id")
 
         # TODO: Re-activate test case when API accepts privacy settings
         # with self._different_user():
diff --git a/lib/galaxy_test/api/test_pages.py b/lib/galaxy_test/api/test_pages.py
index 26f632267d5..7e570a4833f 100644
--- a/lib/galaxy_test/api/test_pages.py
+++ b/lib/galaxy_test/api/test_pages.py
@@ -1,6 +1,7 @@
 from requests import delete
 
 from galaxy.exceptions import error_codes
+from galaxy_test.api.sharable import SharingApiTests
 from galaxy_test.base.populators import DatasetPopulator, skip_without_tool, WorkflowPopulator
 from ._framework import ApiTestCase
 
@@ -36,7 +37,13 @@ class BasePageApiTestCase(ApiTestCase):
         return request
 
 
-class PageApiTestCase(BasePageApiTestCase):
+class PageApiTestCase(BasePageApiTestCase, SharingApiTests):
+
+    api_name = "pages"
+
+    def create(self, name: str) -> str:
+        response_json = self._create_valid_page_with_slug(name)
+        return response_json["id"]
 
     def test_create(self):
         response_json = self._create_valid_page_with_slug("mypage")
diff --git a/lib/galaxy_test/api/test_tools.py b/lib/galaxy_test/api/test_tools.py
index c834078fa21..faa693d9f5e 100644
--- a/lib/galaxy_test/api/test_tools.py
+++ b/lib/galaxy_test/api/test_tools.py
@@ -402,11 +402,21 @@ class ToolsTestCase(ApiTestCase, TestsTools):
 
     def test_unzip_nested(self):
         with self.dataset_populator.test_history() as history_id:
-            hdca_list_id = self.__build_nested_list(history_id)
+            response = self.dataset_collection_populator.upload_collection(history_id, "list:paired", elements=[
+                {
+                    "name": "test0",
+                    "elements": [
+                        {"src": "pasted", "paste_content": "123\n", "name": "forward", "ext": "txt", "tags": ["#foo"]},
+                        {"src": "pasted", "paste_content": "456\n", "name": "reverse", "ext": "txt", "tags": ["#bar"]},
+                    ]
+                }
+            ])
+            self._assert_status_code_is(response, 200)
+            hdca_id = response.json()["outputs"][0]["id"]
             inputs = {
                 "input": {
                     'batch': True,
-                    'values': [{'src': 'hdca', 'map_over_type': 'paired', 'id': hdca_list_id}],
+                    'values': [{'src': 'hdca', 'map_over_type': 'paired', 'id': hdca_id}],
                 }
             }
             self.dataset_populator.wait_for_history(history_id, assert_ok=True)
diff --git a/lib/galaxy_test/api/test_visualizations.py b/lib/galaxy_test/api/test_visualizations.py
index f60422a1b64..8f25f1049a9 100644
--- a/lib/galaxy_test/api/test_visualizations.py
+++ b/lib/galaxy_test/api/test_visualizations.py
@@ -5,6 +5,7 @@ from requests import (
     put
 )
 
+from galaxy_test.api.sharable import SharingApiTests
 from galaxy_test.base.api_asserts import assert_has_keys
 from ._framework import ApiTestCase
 
@@ -19,7 +20,13 @@ REVISION_KEYS = [
 ]
 
 
-class VisualizationsApiTestCase(ApiTestCase):
+class VisualizationsApiTestCase(ApiTestCase, SharingApiTests):
+
+    api_name = "visualizations"
+
+    def create(self, _: str) -> str:
+        viz_id, _ = self._create_viz()
+        return viz_id
 
     def test_index_and_show(self):
         self._create_viz()  # to ensure on exists to index
@@ -46,6 +53,12 @@ class VisualizationsApiTestCase(ApiTestCase):
         response = self._raw_create_viz(config="3 = nime")
         self._assert_status_code_is(response, 400)
 
+    def test_sharing(self):
+        viz_id, _ = self._create_viz()
+        sharing_response = self._get(f"visualizations/{viz_id}/sharing")
+        self._assert_status_code_is(sharing_response, 200)
+        self._assert_has_keys(sharing_response.json(), "title", "importable", "id", "username_and_slug", "published", "users_shared_with")
+
     def test_update_title(self):
         viz_id, viz = self._create_viz()
         update_url = self._api_url("visualizations/%s" % viz_id, use_key=True)
diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index fbc6fee90b2..ef42f1cf7c7 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -472,6 +472,23 @@ class WorkflowsApiTestCase(BaseWorkflowsApiTestCase, ChangeDatatypeTestCase):
         update_response = self._update_workflow(workflow['id'], workflow).json()
         assert update_response['tags'] == []
 
+    def test_update_name(self):
+        original_name = "test update name"
+        workflow_object = self.workflow_populator.load_workflow(name=original_name)
+        workflow_object["license"] = "AAL"
+        upload_response = self.__test_upload(workflow=workflow_object, name=original_name)
+        workflow = upload_response.json()
+        workflow_id = workflow['id']
+        assert workflow['name'] == original_name
+        workflow_dict = self.workflow_populator.download_workflow(workflow_id)
+        assert workflow_dict["license"] == "AAL"
+
+        data = {"name": "my cool new name"}
+        update_response = self._update_workflow(workflow['id'], data).json()
+        assert update_response['name'] == "my cool new name"
+        workflow_dict = self.workflow_populator.download_workflow(workflow_id)
+        assert workflow_dict["license"] == "AAL"
+
     def test_refactor(self):
         workflow_id = self.workflow_populator.upload_yaml_workflow("""
 class: GalaxyWorkflow
diff --git a/lib/galaxy_test/driver/driver_util.py b/lib/galaxy_test/driver/driver_util.py
index 8f8681fb8ce..7f6108f56f7 100644
--- a/lib/galaxy_test/driver/driver_util.py
+++ b/lib/galaxy_test/driver/driver_util.py
@@ -22,14 +22,11 @@ import nose.loader
 import nose.plugins.manager
 import yaml
 from paste import httpserver
-from sqlalchemy_utils import (
-    create_database,
-    database_exists,
-)
 
 from galaxy.app import UniverseApplication as GalaxyUniverseApplication
 from galaxy.config import LOGGING_CONFIG_DEFAULT
 from galaxy.model import mapping
+from galaxy.model.database_utils import create_database, database_exists
 from galaxy.model.tool_shed_install import mapping as toolshed_mapping
 from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool
 from galaxy.util import asbool, download_to_file, galaxy_directory
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 21b70f4b179..6e476032a25 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -137,6 +137,34 @@ class WorkflowEditorTestCase(SeleniumTestCase):
         self.sleep_for(self.wait_types.UX_RENDER)
         self.screenshot("workflow_editor_data_collection_input_deleted")
 
+    @selenium_test
+    def test_data_column_input_editing(self):
+        self.open_in_workflow_editor("""
+class: GalaxyWorkflow
+steps:
+  column_param_list:
+    tool_id: column_param_list
+    state:
+      col: ["1","2","3"]
+      col_names: ["a", "b", "c"]
+      """)
+        editor = self.components.workflow_editor
+        node = editor.node._(label="column_param_list")
+        node.title.wait_for_and_click()
+        columns = self.components.tool_form.parameter_textarea(parameter='col')
+        textarea_columns = columns.wait_for_visible()
+        assert textarea_columns.get_attribute('value') == '1\n2\n3\n'
+        column_names = self.components.tool_form.parameter_textarea(parameter='col_names')
+        textarea_column_names = column_names.wait_for_visible()
+        assert textarea_column_names.get_attribute('value') == 'a\nb\nc\n'
+        self.set_text_element(columns, '4\n5\n6\n')
+        self.assert_has_changes_and_save()
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.driver.refresh()
+        node.title.wait_for_and_click()
+        textarea_columns = columns.wait_for_visible()
+        assert textarea_columns.get_attribute('value') == '4\n5\n6\n'
+
     @selenium_test
     def test_integer_input(self):
         editor = self.components.workflow_editor
@@ -230,6 +258,19 @@ steps:
         self.workflow_editor_connect("input1#output", "first_cat#input1", screenshot_partial="workflow_editor_connection_dragging")
         self.assert_connected("input1#output", "first_cat#input1")
 
+    @selenium_test
+    def test_reconnecting_nodes(self):
+        name = self.open_in_workflow_editor(WORKFLOW_SIMPLE_CAT_TWICE)
+        self.assert_connected("input1#output", "first_cat#input1")
+        self.workflow_editor_destroy_connection("first_cat#input1")
+        self.assert_not_connected("input1#output", "first_cat#input1")
+        self.workflow_editor_connect("input1#output", "first_cat#input1")
+        self.assert_connected("input1#output", "first_cat#input1")
+        self.assert_has_changes_and_save()
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.workflow_index_open_with_name(name)
+        self.assert_connected("input1#output", "first_cat#input1")
+
     @selenium_test
     def test_rendering_output_collection_connections(self):
         self.open_in_workflow_editor(WORKFLOW_WITH_OUTPUT_COLLECTION)
@@ -535,6 +576,7 @@ steps:
         self.workflow_index_open()
         self.workflow_index_open_with_name(name)
         self.workflow_editor_click_option("Auto Layout")
+        return name
 
     def workflow_editor_source_sink_terminal_ids(self, source, sink):
         editor = self.components.workflow_editor
diff --git a/lib/tool_shed/grids/repository_grids.py b/lib/tool_shed/grids/repository_grids.py
index d60702f4a7f..9c5573d67fb 100644
--- a/lib/tool_shed/grids/repository_grids.py
+++ b/lib/tool_shed/grids/repository_grids.py
@@ -1,3 +1,4 @@
+import json
 import logging
 
 from markupsafe import escape as escape_html
@@ -180,7 +181,7 @@ class RepositoryGrid(grids.Grid):
     class EmailAlertsColumn(grids.TextColumn):
 
         def get_value(self, trans, grid, repository):
-            if trans.user and trans.user.email in repository.email_alerts:
+            if trans.user and repository.email_alerts and trans.user.email in json.loads(repository.email_alerts):
                 return 'yes'
             return ''
 
diff --git a/lib/tool_shed/util/commit_util.py b/lib/tool_shed/util/commit_util.py
index 10289b0788d..995e30d1ceb 100644
--- a/lib/tool_shed/util/commit_util.py
+++ b/lib/tool_shed/util/commit_util.py
@@ -1,5 +1,6 @@
 import bz2
 import gzip
+import json
 import logging
 import os
 import shutil
@@ -71,7 +72,8 @@ def check_file_contents_for_email_alerts(app):
     admin_users = app.config.get("admin_users", "").split(",")
     for repository in sa_session.query(app.model.Repository) \
                                 .filter(app.model.Repository.table.c.email_alerts != null()):
-        for user_email in repository.email_alerts:
+        email_alerts = json.loads(repository.email_alerts)
+        for user_email in email_alerts:
             if user_email in admin_users:
                 return True
     return False
diff --git a/lib/tool_shed/util/shed_util_common.py b/lib/tool_shed/util/shed_util_common.py
index c450202db7e..aeea59f8b97 100644
--- a/lib/tool_shed/util/shed_util_common.py
+++ b/lib/tool_shed/util/shed_util_common.py
@@ -385,7 +385,7 @@ def handle_email_alerts(app, host, repository, content_alert_str='', new_repo_al
                     email_alerts.append(user.email)
         else:
             subject = "Galaxy tool shed update alert for repository named %s" % str(repository.name)
-            email_alerts = repository.email_alerts
+            email_alerts = json.loads(repository.email_alerts)
         for email in email_alerts:
             to = email.strip()
             # Send it
diff --git a/lib/tool_shed/webapp/controllers/repository.py b/lib/tool_shed/webapp/controllers/repository.py
index 4e0f2484602..aad5dadda05 100644
--- a/lib/tool_shed/webapp/controllers/repository.py
+++ b/lib/tool_shed/webapp/controllers/repository.py
@@ -1658,6 +1658,10 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
         alerts = kwd.get('alerts', '')
         alerts_checked = CheckboxField.is_checked(alerts)
         category_ids = util.listify(kwd.get('category_id', ''))
+        if repository.email_alerts:
+            email_alerts = json.loads(repository.email_alerts)
+        else:
+            email_alerts = []
         allow_push = kwd.get('allow_push', '')
         error = False
         user = trans.user
@@ -1710,12 +1714,14 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
         elif kwd.get('receive_email_alerts_button', False):
             flush_needed = False
             if alerts_checked:
-                if user.email not in repository.email_alerts:
-                    repository.email_alerts.append(user.email)
+                if user.email not in email_alerts:
+                    email_alerts.append(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     flush_needed = True
             else:
-                if user.email in repository.email_alerts:
-                    repository.email_alerts.remove(user.email)
+                if user.email in email_alerts:
+                    email_alerts.remove(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     flush_needed = True
             if flush_needed:
                 trans.sa_session.add(repository)
@@ -1737,7 +1743,7 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
         for obj in options:
             label = obj.username
             allow_push_select_field.add_option(label, trans.security.encode_id(obj.id))
-        checked = alerts_checked or user.email in repository.email_alerts
+        checked = alerts_checked or user.email in email_alerts
         alerts_check_box = CheckboxField('alerts', value=checked)
         changeset_revision_select_field = grids_util.build_changeset_revision_select_field(trans,
                                                                                            repository,
@@ -2267,14 +2273,19 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
             flush_needed = False
             for repository_id in repository_ids:
                 repository = repository_util.get_repository_in_tool_shed(trans.app, repository_id)
-                email_alerts = repository.email_alerts
+                if repository.email_alerts:
+                    email_alerts = json.loads(repository.email_alerts)
+                else:
+                    email_alerts = []
                 if user.email in email_alerts:
                     email_alerts.remove(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     trans.sa_session.add(repository)
                     flush_needed = True
                     total_alerts_removed += 1
                 else:
                     email_alerts.append(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     trans.sa_session.add(repository)
                     flush_needed = True
                     total_alerts_added += 1
@@ -2557,7 +2568,10 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
         display_reviews = kwd.get('display_reviews', False)
         alerts = kwd.get('alerts', '')
         alerts_checked = CheckboxField.is_checked(alerts)
-        email_alerts = repository.email_alerts
+        if repository.email_alerts:
+            email_alerts = json.loads(repository.email_alerts)
+        else:
+            email_alerts = []
         repository_dependencies = None
         user = trans.user
         if user and kwd.get('receive_email_alerts_button', False):
@@ -2565,10 +2579,12 @@ class RepositoryController(BaseUIController, ratings_util.ItemRatings):
             if alerts_checked:
                 if user.email not in email_alerts:
                     email_alerts.append(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     flush_needed = True
             else:
                 if user.email in email_alerts:
                     email_alerts.remove(user.email)
+                    repository.email_alerts = json.dumps(email_alerts)
                     flush_needed = True
             if flush_needed:
                 trans.sa_session.add(repository)
diff --git a/lib/tool_shed/webapp/model/__init__.py b/lib/tool_shed/webapp/model/__init__.py
index bf5a9d0cd86..b7f3b99f260 100644
--- a/lib/tool_shed/webapp/model/__init__.py
+++ b/lib/tool_shed/webapp/model/__init__.py
@@ -183,7 +183,7 @@ class Repository(Dictifiable, _HasTable):
     dict_collection_visible_keys = ['id', 'name', 'type', 'remote_repository_url', 'homepage_url', 'description', 'user_id', 'private', 'deleted',
                                     'times_downloaded', 'deprecated', 'create_time']
     dict_element_visible_keys = ['id', 'name', 'type', 'remote_repository_url', 'homepage_url', 'description', 'long_description', 'user_id', 'private',
-                                 'deleted', 'times_downloaded', 'deprecated', 'create_time', 'ratings', 'reviews', 'reviewers']
+                                 'deleted', 'times_downloaded', 'deprecated', 'create_time']
     file_states = Bunch(NORMAL='n',
                         NEEDS_MERGING='m',
                         MARKED_FOR_REMOVAL='r',
diff --git a/lib/tool_shed/webapp/model/mapping.py b/lib/tool_shed/webapp/model/mapping.py
index e0a2f874c40..5e85647e1c5 100644
--- a/lib/tool_shed/webapp/model/mapping.py
+++ b/lib/tool_shed/webapp/model/mapping.py
@@ -118,7 +118,7 @@ Repository.table = Table("repository", metadata,
                          Column("user_id", Integer, ForeignKey("galaxy_user.id"), index=True),
                          Column("private", Boolean, default=False),
                          Column("deleted", Boolean, index=True, default=False),
-                         Column("email_alerts", JSONType, nullable=True, default=list),
+                         Column("email_alerts", JSONType, nullable=True),
                          Column("times_downloaded", Integer),
                          Column("deprecated", Boolean, default=False))
 
diff --git a/lib/tool_shed/webapp/model/migrate/check.py b/lib/tool_shed/webapp/model/migrate/check.py
index 85bd5998920..2e37c4840b1 100644
--- a/lib/tool_shed/webapp/model/migrate/check.py
+++ b/lib/tool_shed/webapp/model/migrate/check.py
@@ -5,10 +5,8 @@ import sys
 from migrate.versioning import repository, schema
 from sqlalchemy import create_engine, MetaData, Table
 from sqlalchemy.exc import NoSuchTableError
-from sqlalchemy_utils import (
-    create_database,
-    database_exists,
-)
+
+from galaxy.model.database_utils import create_database, database_exists
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/tool_shed/webapp/search/tool_search.py b/lib/tool_shed/webapp/search/tool_search.py
index 97b3dafacc8..4df4a19cba4 100644
--- a/lib/tool_shed/webapp/search/tool_search.py
+++ b/lib/tool_shed/webapp/search/tool_search.py
@@ -13,6 +13,7 @@ from whoosh.qparser import MultifieldParser
 
 from galaxy import exceptions
 from galaxy.exceptions import ObjectNotFound
+from galaxy.util import unicodify
 
 log = logging.getLogger(__name__)
 
@@ -82,7 +83,8 @@ class ToolSearch:
                     hit_dict['repo_name'] = hit.get('repo_name')
                     hit_dict['name'] = hit.get('name')
                     hit_dict['description'] = hit.get('description')
-                    results['hits'].append({'tool': hit_dict, 'matched_terms': hit.matched_terms(), 'score': hit.score})
+                    matched_terms = {k: unicodify(v) for k, v in hit.matched_terms()}
+                    results['hits'].append({'tool': hit_dict, 'matched_terms': matched_terms, 'score': hit.score})
                 return results
             finally:
                 searcher.close()
diff --git a/packages/app/MANIFEST.in b/packages/app/MANIFEST.in
index 8393a3b8e2a..cd53553319a 100644
--- a/packages/app/MANIFEST.in
+++ b/packages/app/MANIFEST.in
@@ -1 +1,4 @@
 include *.rst *.txt LICENSE
+include galaxy/*.yml
+include galaxy/config/sample/*.sample
+include galaxy/jobs/runners/util/job_script/*.sh
diff --git a/packages/app/galaxy/celery b/packages/app/galaxy/celery
new file mode 120000
index 00000000000..6c7157a6e38
--- /dev/null
+++ b/packages/app/galaxy/celery
@@ -0,0 +1 @@
+../../../lib/galaxy/celery
\ No newline at end of file
diff --git a/packages/app/galaxy/config_schema.yml b/packages/app/galaxy/config_schema.yml
new file mode 120000
index 00000000000..6c9a0d37301
--- /dev/null
+++ b/packages/app/galaxy/config_schema.yml
@@ -0,0 +1 @@
+../../../lib/galaxy/webapps/galaxy/config_schema.yml
\ No newline at end of file
diff --git a/packages/app/galaxy/job_config_schema.yml b/packages/app/galaxy/job_config_schema.yml
new file mode 120000
index 00000000000..075efbd9219
--- /dev/null
+++ b/packages/app/galaxy/job_config_schema.yml
@@ -0,0 +1 @@
+../../../lib/galaxy/webapps/galaxy/job_config_schema.yml
\ No newline at end of file
diff --git a/packages/app/galaxy/uwsgi_schema.yml b/packages/app/galaxy/uwsgi_schema.yml
new file mode 120000
index 00000000000..7a34c111575
--- /dev/null
+++ b/packages/app/galaxy/uwsgi_schema.yml
@@ -0,0 +1 @@
+../../../lib/galaxy/webapps/galaxy/uwsgi_schema.yml
\ No newline at end of file
diff --git a/packages/app/requirements.txt b/packages/app/requirements.txt
index 4be8956dc10..c7ff5fbe1b6 100644
--- a/packages/app/requirements.txt
+++ b/packages/app/requirements.txt
@@ -5,6 +5,7 @@ galaxy-tool-util
 galaxy-web-framework
 galaxy-web-stack
 
+celery
 kombu
 Beaker
 pykwalify
diff --git a/packages/app/setup.py b/packages/app/setup.py
index 1617366236e..a69668442c4 100644
--- a/packages/app/setup.py
+++ b/packages/app/setup.py
@@ -32,6 +32,7 @@ TEST_DIR = 'tests'
 PACKAGES = [
     'galaxy',
     'galaxy.actions',
+    'galaxy.config',
     'galaxy.files',
     'galaxy.files.sources',
     'galaxy.forms',
@@ -88,6 +89,8 @@ PACKAGES = [
     'galaxy.webhooks',
     'galaxy.work',
     'galaxy.workflow',
+    'galaxy.workflow.refactor',
+    'galaxy.workflow.reports',
     'galaxy.workflow.resources',
     'galaxy.workflow.schedulers',
 ]
diff --git a/packages/containers/HISTORY.rst b/packages/containers/HISTORY.rst
index 7879816905a..cfba74e217d 100644
--- a/packages/containers/HISTORY.rst
+++ b/packages/containers/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-20.5.1.dev0
+21.1.1.dev0
 ---------------------
 
 
 
+---------------------
+21.1.0 (2021-03-19)
+---------------------
+
+* First release from the 21.01 branch of Galaxy.
+
 ---------------------
 20.5.0 (2020-07-04)
 ---------------------
diff --git a/packages/containers/galaxy/project_galaxy_containers.py b/packages/containers/galaxy/project_galaxy_containers.py
index 3c2121177ff..9368ad8af66 100644
--- a/packages/containers/galaxy/project_galaxy_containers.py
+++ b/packages/containers/galaxy/project_galaxy_containers.py
@@ -1,4 +1,4 @@
-__version__ = '20.5.1.dev0'
+__version__ = '21.1.1.dev0'
 
 PROJECT_NAME = "galaxy-containers"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/data/MANIFEST.in b/packages/data/MANIFEST.in
index 470b799dfc1..e2e6d43c155 100644
--- a/packages/data/MANIFEST.in
+++ b/packages/data/MANIFEST.in
@@ -1,3 +1,6 @@
 include *.rst *.txt LICENSE
+include galaxy/datatypes/set_metadata_tool.xml
+include galaxy/datatypes/converters/*.xml
 include galaxy/datatypes/test/*
-
+include galaxy/model/migrate/migrate.cfg
+include galaxy/model/tool_shed_install/migrate/migrate.cfg
diff --git a/packages/data/requirements.txt b/packages/data/requirements.txt
index 4aa35d837a5..0bce14256f7 100644
--- a/packages/data/requirements.txt
+++ b/packages/data/requirements.txt
@@ -6,6 +6,7 @@ bx-python
 contextvars; python_version >= "3.6" and python_version < "3.7"
 h5py
 isa-rwval
+mrcfile
 parsley
 numpy
 pycryptodome
diff --git a/packages/data/setup.py b/packages/data/setup.py
index 5dd3cc7b84a..857666b8773 100644
--- a/packages/data/setup.py
+++ b/packages/data/setup.py
@@ -31,16 +31,22 @@ TEST_DIR = 'tests'
 PACKAGES = [
     'galaxy',
     'galaxy.datatypes',
+    'galaxy.datatypes.converters',
     'galaxy.datatypes.dataproviders',
     'galaxy.datatypes.display_applications',
     'galaxy.datatypes.util',
     'galaxy.datatypes.test',
     'galaxy.model',
     'galaxy.model.dataset_collections',
+    'galaxy.model.dataset_collections.types',
     'galaxy.model.migrate',
+    'galaxy.model.migrate.versions',
     'galaxy.model.orm',
     'galaxy.model.store',
     'galaxy.model.tool_shed_install',
+    'galaxy.model.tool_shed_install.migrate',
+    'galaxy.model.tool_shed_install.migrate.versions',
+    'galaxy.model.view',
     'galaxy.quota',
     'galaxy.security',
 ]
diff --git a/packages/job_execution/setup.py b/packages/job_execution/setup.py
index 99c7b7943b3..d48fa8f82ea 100644
--- a/packages/job_execution/setup.py
+++ b/packages/job_execution/setup.py
@@ -31,6 +31,7 @@ TEST_DIR = 'tests'
 PACKAGES = [
     'galaxy',
     'galaxy.job_execution',
+    'galaxy.job_execution.ports',
     'galaxy.metadata',
 ]
 ENTRY_POINTS = '''
diff --git a/packages/package.Makefile b/packages/package.Makefile
index 16014364d2e..f924ba81fe7 100644
--- a/packages/package.Makefile
+++ b/packages/package.Makefile
@@ -9,7 +9,7 @@ SOURCE_DIR?=galaxy
 BUILD_SCRIPTS_DIR=scripts
 DEV_RELEASE?=0
 VERSION?=$(shell DEV_RELEASE=$(DEV_RELEASE) python $(BUILD_SCRIPTS_DIR)/print_version_for_release.py $(SOURCE_DIR) $(DEV_RELEASE))
-PROJECT_NAME?="galaxy-$(shell basename $(CURDIR))"
+PROJECT_NAME?=galaxy-$(shell basename $(CURDIR))
 PROJECT_NAME:=$(subst _,-,$(PROJECT_NAME))
 BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
 TEST_DIR?=tests
diff --git a/packages/tool_util/HISTORY.rst b/packages/tool_util/HISTORY.rst
index 165a0fe52ba..f6fce4fb098 100644
--- a/packages/tool_util/HISTORY.rst
+++ b/packages/tool_util/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-21.1.0.dev0
+21.1.1.dev0
 ---------------------
 
 
 
+---------------------
+21.1.0 (2021-03-19)
+---------------------
+
+* First release from the 21.01 branch of Galaxy.
+
 ---------------------
 20.9.1 (2020-10-28)
 ---------------------
diff --git a/packages/tool_util/galaxy/project_galaxy_tool_util.py b/packages/tool_util/galaxy/project_galaxy_tool_util.py
index 7516d10f703..a9cc5a8b7af 100644
--- a/packages/tool_util/galaxy/project_galaxy_tool_util.py
+++ b/packages/tool_util/galaxy/project_galaxy_tool_util.py
@@ -1,4 +1,4 @@
-__version__ = '21.1.0.dev7'
+__version__ = '21.1.1.dev0'
 
 PROJECT_NAME = "galaxy-tool-util"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/util/HISTORY.rst b/packages/util/HISTORY.rst
index d43cd7a8e85..de409719eff 100644
--- a/packages/util/HISTORY.rst
+++ b/packages/util/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-20.9.2.dev0
+21.1.1.dev0
 ---------------------
 
 
 
+---------------------
+21.1.0 (2021-03-19)
+---------------------
+
+* First release from the 21.01 branch of Galaxy.
+
 ---------------------
 20.9.1 (2020-10-28)
 ---------------------
diff --git a/packages/util/galaxy/project_galaxy_util.py b/packages/util/galaxy/project_galaxy_util.py
index 74d97f8c6ff..15d19c73c22 100644
--- a/packages/util/galaxy/project_galaxy_util.py
+++ b/packages/util/galaxy/project_galaxy_util.py
@@ -1,4 +1,4 @@
-__version__ = '20.9.2.dev0'
+__version__ = '21.1.1.dev0'
 
 PROJECT_NAME = "galaxy-util"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/util/setup.py b/packages/util/setup.py
index 0ca02300642..40dc9978d31 100644
--- a/packages/util/setup.py
+++ b/packages/util/setup.py
@@ -34,6 +34,7 @@ PACKAGES = [
     'galaxy.util',
     'galaxy.util.custom_logging',
     'galaxy.util.path',
+    'galaxy.util.tool_shed',
 ]
 ENTRY_POINTS = '''
         [console_scripts]
diff --git a/packages/webapps/MANIFEST.in b/packages/webapps/MANIFEST.in
index 8393a3b8e2a..fcfa3c8f286 100644
--- a/packages/webapps/MANIFEST.in
+++ b/packages/webapps/MANIFEST.in
@@ -1 +1,2 @@
 include *.rst *.txt LICENSE
+include galaxy/datatypes/display_applications/configs/*/*.xml
diff --git a/packages/webapps/galaxy/datatypes/display_applications/configs b/packages/webapps/galaxy/datatypes/display_applications/configs
new file mode 120000
index 00000000000..bd4fe9cae4a
--- /dev/null
+++ b/packages/webapps/galaxy/datatypes/display_applications/configs
@@ -0,0 +1 @@
+../../../../../lib/galaxy/datatypes/display_applications/configs
\ No newline at end of file
diff --git a/packages/webapps/requirements.txt b/packages/webapps/requirements.txt
index d4641af2264..c7fb5188051 100644
--- a/packages/webapps/requirements.txt
+++ b/packages/webapps/requirements.txt
@@ -2,4 +2,5 @@ galaxy-app
 Cheetah3
 Mako
 fastapi
-starlette
\ No newline at end of file
+fastapi-utils
+starlette
diff --git a/pull_request_template.md b/pull_request_template.md
index 255166db53a..2ba405eebbd 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -15,5 +15,9 @@
 - [ ] Instructions for manual testing are as follows:
   1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]
 
+## License
+- [x] I agree to license these contributions under [Galaxy's current license](https://github.com/galaxyproject/galaxy/blob/dev/LICENSE.txt).
+- [x] I agree to allow the Galaxy committers to license these and all my past contributions to the core galaxy codebase under the [MIT license](https://opensource.org/licenses/MIT). If this condition is an issue, uncheck and just let us know why with an e-mail to galaxy-committers@lists.galaxyproject.org.
+
 ## For UI Components
 - [ ] I've included a screenshot of the changes
diff --git a/pyproject.toml b/pyproject.toml
index 8400ecf95a8..1e516fedbe3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,10 +25,12 @@ bleach = "*"
 boltons = "*"
 boto = "*"
 bx-python = "*"
+celery = "*"
 Cheetah3 = "*"
 cloudauthz = "==0.6.0"
 cloudbridge = "*"
 contextvars = {version = "*", python = "~3.6"}
+circus = "*"
 cwltool = "==3.0.20201109103151"
 dictobj = "*"
 docutils = "*"
@@ -41,11 +43,12 @@ gxformat2 = "*"
 h5py = "!=2.7.0, !=2.7.1"
 isa-rwval = "*"
 kombu = "*"
-lagom = "*"
+lagom = "<1.2.1"  # maximum recursion depth exceeded (on functional_tests run)
 Mako = "*"
 Markdown = "*"
 MarkupSafe = "*"
 Mercurial = "*"
+mrcfile = "*"
 nodeenv = "*"
 nose = "*"
 numpy = "*"
@@ -68,7 +71,6 @@ social-auth-core = {version = "==3.3.0", extras = ["openidconnect"]}
 sortedcontainers = "*"
 SQLAlchemy = ">=1.3.22, <1.4.0"  # https://github.com/kvesteri/sqlalchemy-utils/issues/474
 sqlalchemy-migrate = "*"
-SQLAlchemy-Utils = "!=0.36.8"  # https://github.com/kvesteri/sqlalchemy-utils/issues/462
 sqlitedict = "*"
 sqlparse = "*"
 starlette = "*"
@@ -87,7 +89,7 @@ gunicorn = "*"
 lxml = "!=4.2.2"
 markdown-it-reporter = "*"
 NoseHTML = "*"
-pygithub = "*"
+pygithub = ">=1.54.1"  # prevent downgrade (depends on pyjwt(<2.0); pyjwt auto-upgrade to 2.0.1 causes pygithub downgrade to 1.53)
 pytest = "*"
 pytest-asyncio = "*"
 pytest-cov = "*"
diff --git a/scripts/bootstrap_history.py b/scripts/bootstrap_history.py
index 494911839ea..c891d710099 100644
--- a/scripts/bootstrap_history.py
+++ b/scripts/bootstrap_history.py
@@ -200,14 +200,15 @@ RELEASE_ISSUE_TEMPLATE = string.Template("""
 
 - [X] **Prep**
 
-    - [X] ~~Create this release issue ``make release-issue RELEASE_CURR=${version}``.~~
+    - [X] ~~Create this release issue ``make release-issue``.~~
     - [X] ~~Set freeze date (${freeze_date}).~~
 
 - [ ] **Branch Release (on or around ${freeze_date})**
 
     - [ ] Ensure all [blocking milestone PRs](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged, delayed, or closed.
 
-          make release-check-blocking-prs RELEASE_CURR=${version}
+          make release-check-blocking-prs
+
     - [ ] Merge the latest release into dev and push upstream.
 
           make release-merge-stable-to-next RELEASE_PREVIOUS=release_${previous_version}
@@ -215,12 +216,13 @@ RELEASE_ISSUE_TEMPLATE = string.Template("""
 
     - [ ] Create and push release branch:
 
-          make release-create-rc RELEASE_CURR=${version} RELEASE_NEXT=${next_version}
+          make release-create-rc
 
     - [ ] Open PRs from your fork of branch ``version-${version}`` to upstream ``release_${version}`` and of ``version-${next_version}.dev`` to ``dev``.
-    - [ ] Update ``MILESTONE_NUMBER`` in the [ maintenance bot](https://github.com/galaxyproject/galaxy/blob/dev/.github/workflows/maintenance_bot.yaml) to `${next_version}` so it properly tags new PRs.
+    - [ ] Update ``MILESTONE_NUMBER`` in the [maintenance bot](https://github.com/galaxyproject/galaxy/blob/dev/.github/workflows/maintenance_bot.yaml) to `${next_version}` so it properly tags new PRs.
 
 - [ ] **Issue Review Timeline Notes**
+
     - [ ] Ensure any security fixes will be ready prior to ${freeze_date} + 1 week, to allow time for notification prior to release.
     - [ ] Ensure ownership of outstanding bugfixes and track progress during freeze.
 
@@ -265,11 +267,11 @@ RELEASE_ISSUE_TEMPLATE = string.Template("""
     - [ ] Ensure all PRs merged into the pre-release branch during the freeze have [milestones attached](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_{version}+is%3Amerged+no%3Amilestone) and that they are the not [${next_version} milestones](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_{version}+is%3Amerged+milestone%3A{next_version})
     - [ ] Ensure release notes include all PRs added during the freeze by re-running the release note bootstrapping:
 
-          make release-bootstrap-history RELEASE_CURR=${version}
+          make release-bootstrap-history
     - [ ] Ensure previous release is merged into current. [GitHub branch comparison](https://github.com/galaxyproject/galaxy/compare/release_${version}...release_${previous_version})
     - [ ] Create and push release tag:
 
-          make release-create RELEASE_CURR=${version}
+          make release-create
 
     - [ ] Add the branch `*/release_{version}` to Jenkins documentation build [configuration matrix](https://jenkins.galaxyproject.org/job/galaxy-sphinx-by-branch/configure).
     - [ ] Trigger the [branch documentation build](https://jenkins.galaxyproject.org/job/galaxy-sphinx-by-branch/)
@@ -294,7 +296,7 @@ RELEASE_ISSUE_TEMPLATE = string.Template("""
 - [ ] **Prepare for next release**
 
     - [ ] Close milestone ``${version}`` and ensure milestone ``${next_version}`` exists.
-    - [ ] Create release issue for next version ``make release-issue RELEASE_CURR=${next_version}``.
+    - [ ] Create release issue for next version ``make release-issue``.
     - [ ] Schedule committer meeting to discuss re-alignment of priorities.
     - [ ] Close this issue.
 """)
@@ -314,21 +316,6 @@ GROUPPED_TAGS = OrderedDict([
 # https://api.github.com/repos/galaxyproject/galaxy/compare/release_15.05...dev
 
 
-def print_next_minor_version():
-    minor_version_str = None
-    with open(GALAXY_VERSION_FILE) as f:
-        for line in f:
-            result = re.match(r'VERSION_MINOR = "(.*)"', line)
-            if result:
-                minor_version_str = result.group(1)
-                break
-    try:
-        minor_version = int(minor_version_str)
-    except (TypeError, ValueError):
-        minor_version = 0
-    print(minor_version + 1)
-
-
 def release_issue(argv):
     release_name = argv[2]
     previous_release = _previous_release(release_name)
@@ -511,10 +498,6 @@ def main(argv, seen_prs=None):
     newest_release = None
     seen_prs = seen_prs or set()
 
-    if argv[1] == "--print-next-minor-version":
-        print_next_minor_version()
-        return
-
     if argv[1] == "--check-blocking-prs":
         check_blocking_prs(argv)
         return
diff --git a/scripts/create_db.py b/scripts/create_db.py
index bd0c7aac83b..39d808c8065 100755
--- a/scripts/create_db.py
+++ b/scripts/create_db.py
@@ -33,7 +33,7 @@ log = logging.getLogger(__name__)
 def invoke_create():
     config = get_config(sys.argv)
     if config['database'] == 'galaxy':
-        create_db(config['db_url'], config['config_file'])
+        create_db(config['db_url'], config['config_file'], map_install_models=not config['install_database_connection'])
     elif config['database'] == 'tool_shed':
         create_tool_shed_db(config['db_url'])
     elif config['database'] == 'install':
diff --git a/scripts/release.sh b/scripts/release.sh
new file mode 100755
index 00000000000..587f5e52902
--- /dev/null
+++ b/scripts/release.sh
@@ -0,0 +1,623 @@
+#!/usr/bin/env bash
+set -euo pipefail
+shopt -s extglob
+
+# TODO: upload packages
+# TODO: set dev version in 21.01 (+ 20.09?) branches
+
+: ${VENV:=.venv}
+: ${FORK_REMOTE:=origin}
+: ${UPSTREAM_REMOTE:=upstream}
+: ${UPSTREAM_REMOTE_URL:=git@github.com:galaxyproject/galaxy.git}
+: ${DEV_BRANCH:=dev}
+: ${STABLE_BRANCH:=master}
+
+# Vars for local releases
+: ${RELEASE_LOCAL_TAG:=local}
+: ${RELEASE_LOCAL_COMMIT:=$(git rev-parse --short HEAD)}
+: ${RELEASE_LOCAL_VERSION:=${RELEASE_LOCAL_TAG}$(date -u +%Y%m%dT%H%M%SZ).${RELEASE_LOCAL_COMMIT}}
+
+# Only use this for dev/testing/CI to ignore forward merge conflicts, skip confirmation and package builds, etc.
+: ${TEST_MODE:=false}
+
+VERIFY_PACKAGES=(wheel packaging)
+
+BRANCH_CURR=$(git branch --show-current)
+
+: ${RELEASE_CURR:=$(grep '^VERSION_MAJOR' lib/galaxy/version.py | sed -E -e "s/^[^'\"]*['\"]([^'\"]*)['\"]$/\1/")}
+RELEASE_NEXT=
+RELEASE_CURR_MINOR=
+RELEASE_CURR_MINOR_NEXT=
+RELEASE_CURR_MINOR_NEXT_DEV=
+RELEASE_TYPE=
+PACKAGE_VERSION=
+
+declare -a CLEAN_BRANCHES
+declare -a CLEAN_TAGS
+CLEAN_BRANCHES=()
+CLEAN_TAGS=()
+
+declare -a PUSH_BRANCHES
+PUSH_BRANCHES=()
+
+WORKING_DIR_CLEAN=false
+ERROR=false
+
+NEXT_RELEASE_TEMPLATE="import datetime; print((datetime.datetime.strptime('RELEASE_CURR', '%y.%m').date() + datetime.timedelta(days=(31 * 4))).strftime('%y.%m'))"
+PACKAGE_VERSION_TEMPLATE="import packaging.version; print('.'.join(map(str, packaging.version.parse('VERSION').release)))"
+PACKAGE_DEV_VERSION_TEMPLATE="import packaging.version; print(packaging.version.parse('VERSION'))"
+
+
+while getopts ":clr:" opt; do
+    case "$opt" in
+        c)
+            RELEASE_TYPE='rc'
+            ;;
+        r)
+            RELEASE_CURR="$OPTARG"
+            ;;
+        l)
+            RELEASE_TYPE='local'
+            ;;
+        *)
+            echo "usage: $(basename "$0") [-c (force rc)] [-l (local release)] [-r release version]"
+            exit 1
+            ;;
+    esac
+done
+
+
+function trap_handler() {
+    { set +x; } 2>/dev/null
+    local file
+    $ERROR && log_func=log_error || log_func=log
+    $log_func "Cleaning up..."
+    if $WORKING_DIR_CLEAN; then
+        log_exec git reset -- .
+        log_exec git checkout -- .
+    fi
+    [ "$(git branch --show-current)" == "$BRANCH_CURR" ] || log_exec git checkout "$BRANCH_CURR"
+    [ "${#CLEAN_BRANCHES[@]}" -eq 0 ] || git branch -D "${CLEAN_BRANCHES[@]}"
+    $ERROR && exit 1 || exit 0
+}
+
+
+function trap_handler_err() {
+    ERROR=true
+    for tag in "${CLEAN_TAGS[@]}"; do
+        log_exec git tag -d "$tag"
+    done
+    trap_handler
+}
+
+
+function trap_handler_ok() {
+    # if $ERROR is true then the trap handler already ran
+    $ERROR || trap_handler
+}
+
+
+trap "trap_handler_err" SIGTERM SIGINT ERR
+trap "trap_handler_ok" EXIT
+
+
+function log() {
+    [ -t 0 ] && echo -e '\033[1;32m#' "$@" '\033[0m' 1>&2 || echo '#' "$@" 1>&2
+}
+
+
+function log_warning() {
+    [ -t 0 ] && echo -e '\033[1;33mWARNING:' "$@" '\033[0m' 1>&2 || echo 'WARNING:' "$@" 1>&2
+}
+
+
+function log_error() {
+    [ -t 0 ] && echo -e '\033[1;31mERROR:' "$@" '\033[0m' 1>&2 || echo 'ERROR:' "$@" 1>&2
+}
+
+
+function log_debug() {
+    echo "####" "$@" 1>&2
+}
+
+
+function log_exec() {
+    local rc
+    set -x
+    "$@"
+    { rc=$?; set +x; } 2>/dev/null
+    return $rc
+}
+
+
+function fork_owner() {
+    local url=$(git remote get-url "$FORK_REMOTE")
+    case "$url" in
+        https://github.com/*)
+            echo "$url" | awk -F/ '{print $4}'
+            ;;
+        git@github.com:*)
+            echo "$url" | awk -F: '{print $2}' | awk -F/ '{print $1}'
+            ;;
+        file:///*)
+            echo '__DEV_TEST_USER__'
+            ;;
+        *)
+            log_error "Cannot parse remote '$FORK_REMOTE' url for owner username: $url"
+            exit 1
+            ;;
+    esac
+}
+
+
+function ensure_upstream() {
+    if ! git remote -v | grep -E "^${UPSTREAM_REMOTE}\s+" >/dev/null; then
+        log_warning "Remote ${UPSTREAM_REMOTE} does not exist, will be added with URL: ${UPSTREAM_REMOTE_URL}"
+        log_exec git remote add "$UPSTREAM_REMOTE" "$UPSTREAM_REMOTE_URL"
+    fi
+}
+
+
+function ensure_prereqs() {
+    local pip_list
+    log "Checking for uncommitted local modifications..."
+    log_exec git diff --stat --exit-code || { log_error "Some files have changes"; exit 1; }
+    WORKING_DIR_CLEAN=true
+    log "Checking for required packages..."
+    if [ -z "${VIRTUAL_ENV:-}" ]; then
+        [ -d "$VENV" ] || { log_error "Missing venv, please create: ${VENV}"; exit 1; }
+        . "${VENV}/bin/activate"
+    fi
+    pip_list=$(log_exec "${VENV}/bin/pip" list)
+    for package in ${VERIFY_PACKAGES[@]}; do
+        echo "$pip_list" | grep -E "^${package}\s+" || { log_error "Package '${package}' missing from venv: ${VENV}" ; exit 1; }
+    done
+}
+
+
+function user_verify_release() {
+    log "Release Details"
+    local future
+    case "${RELEASE_NEXT:-}" in
+        '')
+            future="${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT_DEV}"
+            ;;
+        *)
+            future="${RELEASE_NEXT}.dev0"
+            ;;
+    esac
+    cat <<EOF
+Release Type:		${RELEASE_TYPE}
+Major Version:		${RELEASE_CURR}
+Minor Version:		${RELEASE_CURR_MINOR_NEXT}
+Package Version:	${PACKAGE_VERSION}
+Future Version:		${future}
+EOF
+    if $TEST_MODE; then
+        log "Confirmation not requested, proceeding..."
+    else
+        log "Press any key to confirm or ^C to exit"
+        read -n 1 -s
+    fi
+}
+
+
+function release_next() {
+    local curr="$1"
+    python3 -c "${NEXT_RELEASE_TEMPLATE/RELEASE_CURR/$curr}"
+}
+
+
+function packaging_version() {
+    local version="$1"
+    local dev_release="$2"
+    if $dev_release; then
+        python3 -c "${PACKAGE_DEV_VERSION_TEMPLATE/VERSION/$version}"
+    else
+        python3 -c "${PACKAGE_VERSION_TEMPLATE/VERSION/$version}"
+    fi
+}
+
+
+function git_checkout_temp() {
+    local name="$1"
+    local ref="$2"
+    log_exec git checkout --no-track -b "$name" "$ref"
+    CLEAN_BRANCHES+=("$name")
+}
+
+
+function branch_exists() {
+    local branch="$1"
+    local ref_base
+    case "$branch" in
+        */*)
+            ref_base='refs/remotes'
+            ;;
+        *)
+            ref_base='refs/heads'
+            ;;
+    esac
+    git for-each-ref --format='%(refname:short)' "${ref_base}/${branch}" | grep -q "^${branch}\$"
+}
+
+
+function _test_forward_merge() {
+    local curr="$1"
+    local next="$(release_next "$curr")"
+    local curr_branch="${UPSTREAM_REMOTE}/release_${curr}"
+    local next_branch="${UPSTREAM_REMOTE}/release_${next}"
+    local curr_local_branch="__release_merge_test_${curr}"
+    local next_local_branch="__release_merge_test_${next}"
+    local recurse=true
+    local strategy=
+    log "Testing forward merge of ${curr} to ${next}"
+    if ! branch_exists "$curr_local_branch"; then
+        branch_exists "$curr_branch" || { log_error "No existing branch for merge test: ${curr_branch}"; exit 1; }
+        git_checkout_temp "$curr_local_branch" "$curr_branch"
+    fi
+    if ! branch_exists "$next_branch"; then
+        next_branch="${UPSTREAM_REMOTE}/${DEV_BRANCH}"
+        recurse=false
+    fi
+    git_checkout_temp "$next_local_branch" "$next_branch"
+    # Test the merge even if ignoring just to test the code path
+    $TEST_MODE && strategy='-X ours'
+    log_exec git merge $strategy -m 'test merge; please ignore' "$curr_local_branch" || { 
+        log_error "Merging unmodified ${curr} to ${next} failed, resolve upstream first!"; exit 1; }
+    if $recurse; then
+        _test_forward_merge "$next"
+    fi
+}
+
+
+function test_forward_merge() {
+    local branch_curr=$(git branch --show-current)
+    _test_forward_merge "$@"
+    git checkout "$branch_curr"
+}
+
+
+function perform_stable_merge() {
+    [ "$RELEASE_TYPE" == 'initial' -o "$RELEASE_TYPE" == 'point' ] || return 0
+    local branch_curr=$(git branch --show-current)
+    git_checkout_temp '__stable' "${UPSTREAM_REMOTE}/${STABLE_BRANCH}"
+    local stable=$(get_version_major)
+    local curr_int=$(echo "$RELEASE_CURR" | tr -d .)
+    local stable_int=$(echo "$stable" | tr -d .)
+    if [ "$curr_int" -ge "$stable_int" ]; then
+        log "Release '${RELEASE_CURR}' >= stable branch release '${stable}', merging 'release_${RELEASE_CURR}' to '${STABLE_BRANCH}'"
+        log_exec git merge -m "Merge branch 'release_${RELEASE_CURR}' into '${STABLE_BRANCH}'" "__release_${RELEASE_CURR}"
+        PUSH_BRANCHES+=("__stable:${STABLE_BRANCH}")
+    else
+        log "Release '${RELEASE_CURR}' < stable branch release '${stable}', skipping merge to to '${STABLE_BRANCH}'"
+    fi
+    git checkout "$branch_curr"
+}
+
+
+function _perform_forward_merge() {
+    local curr="$1"
+    local next="$(release_next "$curr")"
+    local curr_branch="${UPSTREAM_REMOTE}/release_${curr}"
+    local next_branch="${UPSTREAM_REMOTE}/release_${next}"
+    local curr_local_branch="__release_${curr}"
+    local next_local_branch="__release_${next}"
+    local recurse=true
+    log "Performing forward merge of ${curr} to ${next}"
+    branch_exists "$curr_local_branch" || { log_error "Missing expected branch: ${curr_local_branch}"; exit 1; }
+    branch_exists "$next_local_branch" && { log_error "Unexpected branch exists: ${next_local_branch}"; exit 1; }
+    PUSH_BRANCHES+=("${curr_local_branch}:release_${curr}")
+    if ! branch_exists "$next_branch"; then
+        next_branch="${UPSTREAM_REMOTE}/${DEV_BRANCH}"
+        recurse=false
+        PUSH_BRANCHES+=("${next_local_branch}:${DEV_BRANCH}")
+    fi
+    git_checkout_temp "$next_local_branch" "$next_branch"
+    # This should necessarily result in conflicts merging version.py
+	log_exec git merge -X ours -m "Merge branch 'release_${curr}' into 'release_${next}'" "$curr_local_branch"
+    if $recurse; then
+        _perform_forward_merge "$next"
+    fi
+}
+
+
+function perform_forward_merge() {
+    local curr="$1"
+    local branch_curr=$(git branch --show-current)
+    _perform_forward_merge "$@"
+    declare -p PUSH_BRANCHES
+    git checkout "$branch_curr"
+}
+
+
+function push_merged() {
+    local curr="$1"
+    for branch in "${PUSH_BRANCHES[@]}"; do
+        log "Pushing '${branch}' to remote '${UPSTREAM_REMOTE}'"
+        log_exec git push "$UPSTREAM_REMOTE" "$branch"
+    done
+    if [ "$RELEASE_TYPE" == 'initial' -o "$RELEASE_TYPE" == 'point' ]; then
+        log_exec git push --tags "$UPSTREAM_REMOTE"
+    fi
+}
+
+
+function set_package_version_var() {
+    local package_version_minor
+    local dev_release='false'
+    case "$RELEASE_CURR_MINOR_NEXT" in
+        [0-9]*)
+            package_version_minor="$RELEASE_CURR_MINOR_NEXT"
+            ;;
+        dev)
+            # TODO: you can remove this case once the current dev branch minor version is updated to dev0
+            package_version_minor="0dev0"
+            dev_release='true'
+            ;;
+        *)
+            package_version_minor="0${RELEASE_CURR_MINOR_NEXT}"
+            dev_release='true'
+            ;;
+    esac
+    PACKAGE_VERSION=$(packaging_version "${RELEASE_CURR}.${package_version_minor}" "$dev_release")
+}
+
+
+function increment_minor() {
+    local minor="$1"
+    case "$minor" in
+        +([0-9]))
+            [ "$RELEASE_TYPE" != 'rc' ] || {
+                log_error "Cannot create rc after release (current version: ${RELEASE_CURR}.${minor})";
+                exit 1; }
+            echo "$((minor + 1)).dev0"
+            ;;
+        +([0-9]).dev*)
+            [ "$RELEASE_TYPE" != 'rc' ] || {
+                log_error "Cannot create rc after release (current version: ${RELEASE_CURR}.${minor})";
+                exit 1; }
+            echo "${minor%.*}"
+            ;;
+        rc*)
+            if [ "$RELEASE_TYPE" == 'rc' ]; then
+                echo "rc$((${minor#rc*} + 1))"
+            else
+                echo ''
+            fi
+            ;;
+        None|'')
+            [ "$RELEASE_TYPE" != 'rc' ] || {
+                log_error "Cannot create rc after release (current version: ${RELEASE_CURR}.0)";
+                exit 1; }
+            echo '1.dev0'
+            ;;
+        *)
+            log_error "Don't know how to increment minor version: ${minor}"
+            exit 1
+            ;;
+    esac
+}
+
+
+function get_version_major() {
+    grep '^VERSION_MAJOR' lib/galaxy/version.py | sed -E -e "s/^[^'\"]*['\"]([^'\"]*)['\"]$/\1/"
+}
+
+
+function get_version_minor() {
+    grep '^VERSION_MINOR' lib/galaxy/version.py | sed -E -e "s/^[^'\"]*['\"]([^'\"]*)['\"]$/\1/" | tr -d '[[:space:]]'
+}
+
+
+function set_version_vars() {
+    RELEASE_CURR="$(get_version_major)"
+    RELEASE_CURR_MINOR="$(get_version_minor)"
+    [[ "$RELEASE_CURR_MINOR" =~ .*"None"$ ]] && RELEASE_CURR_MINOR='0'
+    : ${RELEASE_TYPE:=point}
+    RELEASE_CURR_MINOR_NEXT="$(increment_minor "$RELEASE_CURR_MINOR")"
+    [ -n "$RELEASE_CURR_MINOR_NEXT" ] || RELEASE_TYPE='initial'
+    RELEASE_CURR_MINOR_NEXT_DEV="$(increment_minor "${RELEASE_CURR_MINOR_NEXT}")"
+    set_package_version_var
+}
+
+
+function update_galaxy_version() {
+    local key="$1"
+    local val="$2"
+    local match="${3:-.*}"
+    log "Updating lib/galaxy/version.py for ${key} = ${val}..."
+    log_exec sed -E -i -e "s/^${key} = ${match}/${key} = \"$val\"/" lib/galaxy/version.py
+}
+
+
+function packages_make_all() {
+    local dir
+    # subshell to preserve cwd
+    (
+        cd packages/
+        for dir in *; do
+            [ ! -d "$dir" -o ! -f "${dir}/setup.py" ] && continue
+            # can't use log_exec here because we want to capture output
+            echo + make -C "$dir" "$@" 1>&2
+            make -C "$dir" "$@" >"${dir}/make-${1}.log" 2>&1
+        done
+    )
+}
+
+
+function update_package_versions() {
+    local package_version="${1:-$PACKAGE_VERSION}"
+    local project_file
+    log "Updating package versions to '${package_version}'..."
+    (
+        cd packages/
+        for dir in *; do
+            project_file="${dir}/galaxy/project_galaxy_${dir}.py"
+            if [ -f "${project_file}" ]; then
+                sed -i -e "s/^__version__ =.*/__version__ = \"${package_version}\"/" "$project_file"
+            fi
+        done
+    )
+    #git diff -- packages/
+}
+
+
+function perform_version_update() {
+    local tag_version=
+    update_package_versions
+    git add -- packages/
+    log 'Cleaning package dirs...'
+    packages_make_all clean
+    log 'Building packages (logs in packages/*/make-dist.log)...'
+    if $TEST_MODE; then
+        log_debug "Test mode skipping package build"
+    else
+        packages_make_all dist
+    fi
+    log 'Committing version changes...'
+	log_exec git commit -m "Update version to ${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT}"
+    case "$RELEASE_TYPE" in
+        initial)
+            tag_version="${RELEASE_CURR}"
+            ;;
+        point)
+            tag_version="${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT}"
+            ;;
+    esac
+    if [ -n "$tag_version" ]; then
+        log_exec git tag -m "Tag version ${tag_version}" "v${tag_version}"
+        CLEAN_TAGS+=("v${tag_version}")
+    fi
+}
+
+
+function perform_version_update_dev() {
+    [ "$RELEASE_TYPE" == 'initial' -o "$RELEASE_TYPE" == 'point' ] || return 0
+    log "Incrementing release version to '${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT_DEV}' for development of next point release"
+    update_galaxy_version 'VERSION_MINOR' "$RELEASE_CURR_MINOR_NEXT_DEV"
+    log_exec git diff --exit-code && { log_error 'Missing expected version.py changes'; exit 1; } || true
+    git add -- lib/galaxy/version.py
+    update_package_versions
+    git add -- packages/
+    log_exec git commit -m "Update version to ${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT_DEV}"
+}
+
+
+function create_release_rc_initial() {
+    RELEASE_TYPE='rc-initial'
+    RELEASE_NEXT="$(release_next "$RELEASE_CURR")"
+    RELEASE_CURR_MINOR_NEXT='rc1'
+    set_package_version_var
+    user_verify_release
+
+    local _dev_branch="${UPSTREAM_REMOTE}/${DEV_BRANCH}"
+    git_checkout_temp "__release_${RELEASE_CURR}" "$_dev_branch"
+
+    update_galaxy_version 'VERSION_MAJOR' "$RELEASE_CURR"
+    update_galaxy_version 'VERSION_MINOR' "$RELEASE_CURR_MINOR_NEXT"
+    log_exec git diff --exit-code && { log_error 'Missing expected version.py changes'; exit 1; } || true
+    git add -- lib/galaxy/version.py
+
+    perform_version_update
+
+    # Increment version in dev branch
+    git_checkout_temp "__release_${RELEASE_NEXT}" "$_dev_branch"
+
+    update_galaxy_version 'VERSION_MAJOR' "$RELEASE_NEXT"
+    update_galaxy_version 'VERSION_MINOR' 'dev0'
+    log_exec git diff --exit-code && { log_error 'Missing expected version.py changes'; exit 1; } || true
+    git add -- lib/galaxy/version.py
+    log_exec sed -i -e "s/^RELEASE_CURR:=.*/RELEASE_CURR:=${RELEASE_NEXT}/" Makefile
+    log_exec git diff --exit-code && { log_error 'Missing expected Makefile changes'; exit 1; } || true
+    git add -- Makefile
+    local package_version=$(packaging_version "${RELEASE_NEXT}.0dev0" "true")
+    update_package_versions "$package_version"
+    git add -- packages/
+    log_exec git commit -m "Update version to ${RELEASE_NEXT}.dev0"
+
+    # Resolve merge conflicts
+	log_exec git merge -X ours -m "Merge branch 'release_${RELEASE_CURR}' into 'dev'" "__release_${RELEASE_CURR}"
+
+    # Push branches for PR
+    local owner=$(fork_owner)
+    local curr_remote_branch="version-${RELEASE_CURR}.${RELEASE_CURR_MINOR_NEXT}"
+    local next_remote_branch="version-${RELEASE_NEXT}.dev"
+    log_exec git push "$FORK_REMOTE" "__release_${RELEASE_CURR}:${curr_remote_branch}"
+    log_exec git push "$FORK_REMOTE" "__release_${RELEASE_NEXT}:${next_remote_branch}"
+    log_exec git push "$UPSTREAM_REMOTE" "refs/remotes/${UPSTREAM_REMOTE}/${DEV_BRANCH}:refs/heads/release_${RELEASE_CURR}"
+
+    #https://github.com/galaxyproject/galaxy/compare/{branch}...{fork_owner}:{branch}
+    log "Open a PR from ${owner}/galaxy:${curr_remote_branch} to galaxyproject/galaxy:release_${RELEASE_CURR}"
+    echo "- https://github.com/galaxyproject/galaxy/compare/release_${RELEASE_CURR}...${owner}:${curr_remote_branch}" 1>&2
+    log "Open a PR from ${owner}/galaxy:${next_remote_branch} to galaxyproject/galaxy:dev"
+    echo "- https://github.com/galaxyproject/galaxy/compare/dev...${owner}:${next_remote_branch}" 1>&2
+}
+
+
+function create_release_local() {
+    RELEASE_CURR_MINOR="$(get_version_minor)"
+    RELEASE_CURR_MINOR_NEXT="${RELEASE_CURR_MINOR}+${RELEASE_LOCAL_VERSION}"
+    set_package_version_var
+    user_verify_release
+    # Append the local portion if this is a point release or the local portion already exists
+    update_galaxy_version 'VERSION_MINOR' "\1+${RELEASE_LOCAL_VERSION}" "['\"]([^+]*)[^'\"\]*['\"]$"
+    # Set the minor version to 0 and append the local version if the release version is not set (e.g. .0)
+    update_galaxy_version 'VERSION_MINOR' "0+${RELEASE_LOCAL_VERSION}" 'None'
+    update_galaxy_version 'VERSION_MINOR' "0+${RELEASE_LOCAL_VERSION}" '""'
+    log_exec git diff --exit-code && { log_error 'Missing expected version.py changes'; exit 1; } || true
+    update_package_versions
+    ##git add -- lib/galaxy/version.py packages/*/galaxy/project_*.py
+    packages_make_all clean
+    log 'Building packages (logs in packages/*/make-dist.log)...'
+    packages_make_all dist
+    ##git commit -m "Update version to $(RELEASE_CURR)"
+    ##git tag -m "Tag version $(RELEASE_CURR)" v$(RELEASE_CURR)
+}
+
+
+function create_release_normal() {
+    local _release_curr="$RELEASE_CURR"
+    local _release_branch="${UPSTREAM_REMOTE}/release_${RELEASE_CURR}"
+    git_checkout_temp "__release_${RELEASE_CURR}" "$_release_branch"
+    set_version_vars
+    [ "$_release_curr" == "$RELEASE_CURR" ] || {
+        log_error "Release is incorrect in branch ${_release_branch}: ${_release_curr} != ${RELEASE_CURR}";
+        exit 1; }
+
+    user_verify_release
+    test_forward_merge "$RELEASE_CURR"
+
+    update_galaxy_version 'VERSION_MINOR' "$RELEASE_CURR_MINOR_NEXT"
+    log_exec git diff --exit-code && { log_error 'Missing expected version.py changes'; exit 1; } || true
+    git add -- lib/galaxy/version.py
+
+    perform_version_update
+    perform_stable_merge
+    perform_version_update_dev
+    perform_forward_merge "$RELEASE_CURR"
+    push_merged "$RELEASE_CURR"
+}
+
+
+function create_release() {
+    log 'Fetching upstream changes...'
+    git fetch "$UPSTREAM_REMOTE"
+    if [ "$RELEASE_TYPE" == 'local' ]; then
+        create_release_local
+    elif ! branch_exists "${UPSTREAM_REMOTE}/release_${RELEASE_CURR}"; then
+        create_release_rc_initial
+    else
+        create_release_normal
+    fi
+}
+
+
+function main() {
+    ensure_upstream
+    ensure_prereqs
+    create_release
+}
+
+
+main
diff --git a/test/functional/tools/column_param_list.xml b/test/functional/tools/column_param_list.xml
index a3c8d99e4f6..a50a6bb0620 100644
--- a/test/functional/tools/column_param_list.xml
+++ b/test/functional/tools/column_param_list.xml
@@ -6,8 +6,8 @@ echo "col_names $col_names" >> '$output2'
     ]]></command>
     <inputs>
         <param name="input1" type="data" format="tabular" label="Input 1" />
-        <param name="col" type="data_column" multiple="true" value="1" data_ref="input1" label="Column to Use" />
-        <param name="col_names" type="data_column" data_ref="input1" use_header_names="true" label="Column to Use" />
+        <param name="col" type="data_column" multiple="true" value="1" data_ref="input1" label="Columns to use" />
+        <param name="col_names" type="data_column" multiple="true" data_ref="input1" use_header_names="true" label="Column names to use" />
     </inputs>
     <outputs>
         <data name="output1" format="tabular" />
@@ -30,21 +30,5 @@ echo "col_names $col_names" >> '$output2'
                 </assert_contents>
             </output>
         </test>
-        <!-- test if non tabular data also creates entries by using the default
-            value (which is the 1st column, but empty if filling the options fails) -->
-        <test>
-            <param name="input1" value="1.bed" />
-            <output name="output1">
-                <assert_contents>
-                    <has_line line="chr1" />
-                </assert_contents>
-            </output>
-            <output name="output2">
-                <assert_contents>
-                    <has_line line="col 1" />
-                    <has_line line="col_names 1" />
-                </assert_contents>
-            </output>
-        </test>
     </tests>
 </tool>
diff --git a/test/functional/tools/discover_sort_by.xml b/test/functional/tools/discover_sort_by.xml
index cb5c1949673..740b0f21ebb 100644
--- a/test/functional/tools/discover_sort_by.xml
+++ b/test/functional/tools/discover_sort_by.xml
@@ -4,6 +4,10 @@ for i in \$(seq 1 10);
 do
     echo "\$i" > \$i.txt;
 done
+## create a directory that matches the discovery pattern
+## but must not be discovered because it's a directory which
+## leads to an error https://github.com/galaxyproject/galaxy/pull/11307
+## && mkdir blah.txt
 ]]></command>
   <inputs/>
   <outputs>
@@ -22,7 +26,6 @@ done
   </outputs>
   <tests>
     <test expect_num_outputs="4">
-      <param name="input1" value="tinywga.fam" />
       <output_collection name="collection_numeric_name" type="list" count="10">
         <element name="1">
           <assert_contents><has_text_matching expression="^.*$"/></assert_contents>
diff --git a/test/functional/tools/filter_multiple_splitter.xml b/test/functional/tools/filter_multiple_splitter.xml
new file mode 100644
index 00000000000..28c2e15f2db
--- /dev/null
+++ b/test/functional/tools/filter_multiple_splitter.xml
@@ -0,0 +1,96 @@
+<tool id="filter_multiple_splitter" name="filter_multiple_splitter" version="0.1.0">
+    <description>Filter input with the multiple value splitter</description>
+    <command><![CDATA[
+        echo $index > '$output' && 
+        echo $index2 >> '$output'
+    ]]></command>
+    <inputs>
+        <param format="tabular" name="inputs" type="data" label="Inputs" help="" multiple="true" />
+        <!-- gff attribute column (8) contains semicolon separated attributes (e.g. ID=Motif:m15;Note=7-transmembrane)
+             - without the filters the complete entries in column 8 will be the options of the parameter
+             - multiple_splitter splits the column and creates a single option from each part 
+               (in the example separate options ID=Motif:m15 and Note=7-transmembrane are created)
+             - results sorted and made unique by the succeeding filters 
+               as a result the options are the attributes of all entries in the GFF -->
+        <param name="index" type="select" label="Splitted options">
+            <options from_dataset="inputs">
+                <column name="name" index="8"/>
+                <column name="value" index="8"/>
+                <filter type="multiple_splitter" column="8" separator=";"/>
+                <filter type="sort_by" column="8"/>
+                <filter type="unique_value" column="8"/>
+                <validator type="no_options" message="No option available for this input" />
+          </options>
+        </param>
+        <!-- test for
+             - splitting at multiple characters 
+             - select multiple options 
+             - unique does not change the order of the entries
+             - value is a different column
+
+             value should be the start position of the first feature that has 
+             the attribute selected by the user
+             -->
+        <param name="index2" type="select" label="Splitted multiple options" multiple="true">
+            <options from_dataset="inputs">
+                <column name="name" index="8"/>
+                <column name="value" index="3"/>
+                <filter type="multiple_splitter" column="8" separator="="/>
+                <filter type="multiple_splitter" column="8" separator=":"/>
+                <filter type="multiple_splitter" column="8" separator=";"/>
+                <filter type="unique_value" column="8"/>
+                <validator type="no_options" message="No option available for this input" />
+          </options>
+        </param>
+    </inputs>
+
+    <outputs>
+        <data format="txt" name="output" />
+    </outputs>
+
+    <tests>
+        <!-- TODOs
+             - simple filter acting on single file and single colum 
+             - column empty, column don't contain separator
+             - filter acting on multiple files 
+             - filter acting on multiple columns (can be specified comma separated)
+             - cobination of both 
+             - combine with regexp search, replace filter to remove 'ID='
+             - combine with param filter to list only Motif*?
+             - is there any use of splitting a different column than name / value
+             -->
+        <test>
+            <param name="inputs" value="5.gff3" />
+            <param name="index" value="ID=Motif:m09" />
+            <param name="index2" value="EDEN.1,seg03" />
+            <output name="output">
+                <assert_contents>
+                    <has_text text="ID=Motif:m09" />    
+                    <has_text text="1050,6885" />    
+                    <not_has_text text="hg18" />
+                </assert_contents>
+            </output>
+        </test>
+		<!-- selecting multiple files does not work at the moment 
+             strange thing: if you try with `planemo s` on loading
+			 the tool shows options from the first file in the selected (which is auto selected)
+			 if the selection is changed no options show up - also if the initially selected 
+             data set is chosen 
+		-->
+        <test>
+            <param name="inputs" value="5.gff3,a.tab" />
+            <param name="index" value="0.0009161" />
+            <param name="index2" value="EDEN.1,seg03" />
+            <output name="output">
+                <assert_contents>
+                    <has_text text="0.0009161" />    
+                    <has_text text="1050,6885" />    
+                    <not_has_text text="hg18" />
+                </assert_contents>
+            </output>
+    </test>
+    </tests>
+
+    <help>
+    </help>
+</tool>
diff --git a/test/functional/tools/implicit_conversion_format_input.xml b/test/functional/tools/implicit_conversion_format_input.xml
new file mode 100644
index 00000000000..e93f5409559
--- /dev/null
+++ b/test/functional/tools/implicit_conversion_format_input.xml
@@ -0,0 +1,22 @@
+<tool id="implicit_conversion_format_input" name="implicit_conversion with input format">
+  <command>
+    cut -f 1 '$input1' > '$output1'
+  </command>
+  <inputs>
+    <param type="data" format="fasta" name="input1" label="Input 1" />
+  </inputs>
+  <outputs>
+    <data name="output1" format="input" />
+  </outputs>
+  <tests>
+    <!-- Test implicit conversion. -->
+    <test>
+      <param name="input1" value="1.fasta.gz" ftype="fasta.gz" />
+      <output name="output1" ftype="fasta">
+        <assert_contents>
+          <has_line line=">hg17" />
+        </assert_contents>
+      </output>
+    </test>
+  </tests>
+</tool>
diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index f26fa8d68d1..0e96f47727e 100644
--- a/test/functional/tools/samples_tool_conf.xml
+++ b/test/functional/tools/samples_tool_conf.xml
@@ -43,6 +43,7 @@
   <tool file="inputs_as_json.xml" />
   <tool file="inputs_as_json_profile.xml" />
   <tool file="inputs_as_json_with_paths.xml" />
+  <tool file="filter_multiple_splitter.xml" />
   <tool file="filter_static_regexp.xml" />
   <tool file="select_from_dataset.xml" />
   <tool file="dbkey_filter_input.xml" />
@@ -133,6 +134,7 @@
   <tool file="empty_output.xml" />
   <tool file="validation_empty_dataset.xml" />
   <tool file="implicit_conversion.xml" />
+  <tool file="implicit_conversion_format_input.xml" />
   <tool file="implicit_collection_conversion.xml" />
   <tool file="implicit_nested_list_conversion.xml" />
   <tool file="explicit_conversion.xml" />
@@ -148,6 +150,7 @@
   <tool file="fail_identifier.xml" />
   <tool file="fail_writing_work_dir_file.xml" />
   <tool file="tool_directory.xml" />
+  <tool file="tool_directory_docker.xml" />
   <tool file="output_action_change_format.xml" />
   <tool file="output_action_change_format_paired.xml" />
   <tool file="collection_paired_test.xml" />
diff --git a/test/functional/tools/tool_directory_docker.xml b/test/functional/tools/tool_directory_docker.xml
new file mode 100644
index 00000000000..fa408789f34
--- /dev/null
+++ b/test/functional/tools/tool_directory_docker.xml
@@ -0,0 +1,22 @@
+<tool id="tool_directory_docker" name="tool_directory_docker" version="1.0.0">
+    <requirements>
+        <container type="docker">busybox:ubuntu-14.04</container>
+    </requirements>
+    <command><![CDATA[
+cp '$__tool_directory__/tool_directory.xml' output1
+    ]]></command>
+    <inputs>
+    </inputs>
+    <outputs>
+        <data name="output1" format="xml" from_work_dir="output1" />
+    </outputs>
+    <tests>
+        <test>
+            <output name="output1">
+                <assert_contents>
+                    <has_text text="QUINE" />
+                </assert_contents>
+            </output>
+        </test>
+    </tests>
+</tool>
diff --git a/test/integration/refgenie.yml b/test/integration/refgenie.yml
new file mode 100644
index 00000000000..c1c5ac61c15
--- /dev/null
+++ b/test/integration/refgenie.yml
@@ -0,0 +1,5 @@
+config_version: 0.4
+genome_folder: /tmp/refgenie
+genome_servers:
+ - http://refgenomes.databio.org
+genomes: null
diff --git a/test/integration/test_data_manager.py b/test/integration/test_data_manager.py
index 61e706c2caa..e1eb581dfa0 100644
--- a/test/integration/test_data_manager.py
+++ b/test/integration/test_data_manager.py
@@ -79,14 +79,62 @@ class DataManagerIntegrationTestCase(integration_util.IntegrationTestCase, UsesS
 
     def test_data_manager_manual(self):
         """
-        Test that data_manager_manual works, which uses a signigicant amount of Galaxy-internal code
+        Test that data_manager_manual works, which uses a significant amount of Galaxy-internal code
         """
         self.install_repository('iuc', 'data_manager_manual', '1ed87dee9e68')
         with self._different_user(email="%s@galaxy.org" % self.username):
             with self.dataset_populator.test_history() as history_id:
-                self.dataset_populator.run_tool(tool_id=DATA_MANAGER_MANUAL_ID,
-                                                inputs=DATA_MANAGER_MANUAL_INPUT,
-                                                history_id=history_id)
+                run_response = self.dataset_populator.run_tool(tool_id=DATA_MANAGER_MANUAL_ID,
+                                                               inputs=DATA_MANAGER_MANUAL_INPUT,
+                                                               history_id=history_id,
+                                                               assert_ok=False)
+                self.dataset_populator.wait_for_tool_run(history_id=history_id, run_response=run_response, timeout=CONDA_AUTO_INSTALL_JOB_TIMEOUT)
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert 'dm6' in entries
+
+        table_content = {line[0]: line for line in self._app.tool_data_tables.get("all_fasta").to_dict(view="element")['fields']}
+
+        self._app.tool_data_tables.get("all_fasta").remove_entry(table_content['dm6'])
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert entries is None
+
+    def test_data_manager_manual_multiple(self):
+        """
+        Test adding/removing on the same data table with multiple data managers
+        """
+        self.install_repository("devteam", "data_manager_fetch_genome_dbkeys_all_fasta", "14eb0fc65c62")
+        self.install_repository('iuc', 'data_manager_manual', '1ed87dee9e68')
+        with self._different_user(email="%s@galaxy.org" % self.username):
+            with self.dataset_populator.test_history() as history_id:
+                run_response = self.dataset_populator.run_tool(tool_id=FETCH_TOOL_ID,
+                                                               inputs=FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT,
+                                                               history_id=history_id,
+                                                               assert_ok=False)
+                self.dataset_populator.wait_for_tool_run(history_id=history_id, run_response=run_response, timeout=CONDA_AUTO_INSTALL_JOB_TIMEOUT)
+                run_response = self.dataset_populator.run_tool(tool_id=DATA_MANAGER_MANUAL_ID,
+                                                               inputs=DATA_MANAGER_MANUAL_INPUT,
+                                                               history_id=history_id,
+                                                               assert_ok=False)
+                self.dataset_populator.wait_for_tool_run(history_id=history_id, run_response=run_response, timeout=CONDA_AUTO_INSTALL_JOB_TIMEOUT)
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'NC_001617.1', 'dbkey')
+        assert 'NC_001617.1' in entries
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert 'dm6' in entries
+
+        table_content = {line[0]: line for line in self._app.tool_data_tables.get("all_fasta").to_dict(view="element")['fields']}
+
+        self._app.tool_data_tables.get("all_fasta").remove_entry(table_content['dm6'])
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert entries is None
+
+        self._app.tool_data_tables.get("all_fasta").remove_entry(table_content['NC_001617.1'])
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'NC_001617.1', 'dbkey')
+        assert entries is None
 
     @classmethod
     def get_secure_ascii_digits(cls, n=12):
diff --git a/test/integration/test_data_manager_refgenie.py b/test/integration/test_data_manager_refgenie.py
new file mode 100644
index 00000000000..73e4d63f023
--- /dev/null
+++ b/test/integration/test_data_manager_refgenie.py
@@ -0,0 +1,115 @@
+import os
+import random
+import string
+
+from nose.plugins.skip import SkipTest
+
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import integration_util
+from .uses_shed import CONDA_AUTO_INSTALL_JOB_TIMEOUT, UsesShed
+
+FETCH_TOOL_ID = 'toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.3'
+FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT = {
+    "dbkey_source|dbkey_source_selector": "new",
+    "dbkey_source|dbkey": "NC_001617.1",
+    "dbkey_source|dbkey_name": "NC_001617.1",
+    "sequence_name": "NC_001617.1",
+    "sequence_id": "NC_001617.1",
+    "reference_source|reference_source_selector": "url",
+    "reference_source|user_url": "https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/master/NC_001617.1.fasta",
+    "sorting|sort_selector": "as_is"
+}
+SAM_FASTA_ID = "toolshed.g2.bx.psu.edu/repos/devteam/data_manager_sam_fasta_index_builder/sam_fasta_index_builder/0.0.3"
+SAM_FASTA_INPUT = {"all_fasta_source": "NC_001617.1", "sequence_name": "", "sequence_id": ""}
+DATA_MANAGER_MANUAL_ID = 'toolshed.g2.bx.psu.edu/repos/iuc/data_manager_manual/data_manager_manual/0.0.2'
+DATA_MANAGER_MANUAL_INPUT = {
+    "data_tables_0|data_table_name": "all_fasta",
+    "data_tables_0|columns_0|data_table_column_name": "value",
+    "data_tables_0|columns_0|data_table_column_value": "dm6",
+    "data_tables_0|columns_1|data_table_column_name": "name",
+    "data_tables_0|columns_1|data_table_column_value": "dm6",
+    "data_tables_0|columns_2|data_table_column_name": "dbkey",
+    "data_tables_0|columns_2|data_table_column_value": "dm6",
+    "data_tables_0|columns_3|data_table_column_name": "path",
+    "data_tables_0|columns_3|data_table_column_value": "dm6.fa",
+}
+DATA_MANAGER_MANUAL_INPUT_DBKEY = {
+    "data_tables_0|data_table_name": "__dbkeys__",
+    "data_tables_0|columns_0|data_table_column_name": "value",
+    "data_tables_0|columns_0|data_table_column_value": "dm7",
+    "data_tables_0|columns_1|data_table_column_name": "name",
+    "data_tables_0|columns_1|data_table_column_value": "dm7",
+    "data_tables_0|columns_2|data_table_column_name": "len_path",
+    "data_tables_0|columns_2|data_table_column_value": "dm7.len",
+}
+SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
+REFGENIE_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "refgenie.yml")
+
+
+class DataManagerIntegrationTestCase(integration_util.IntegrationTestCase, UsesShed):
+
+    """Test data manager installation and table reload through the API"""
+
+    framework_tool_and_types = True
+    use_shared_connection_for_amqp = True
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        try:
+            import watchdog  # noqa: F401
+        except ImportError:
+            raise SkipTest("watchdog library is not available")
+        cls.configure_shed_and_conda(config)
+        config["tool_data_path"] = cls.shed_tool_data_dir
+        config["watch_tool_data_dir"] = True
+        cls.username = cls.get_secure_ascii_digits()
+        config["admin_users"] = "%s@galaxy.org" % cls.username
+        config["refgenie_config_file"] = REFGENIE_CONFIG_FILE
+
+    def test_data_manager_manual_refgenie(self):
+        """
+        Test that data_manager_manual works with refgenie enabled, which uses a significant amount of Galaxy-internal code
+        """
+        self.install_repository('iuc', 'data_manager_manual', '1ed87dee9e68')
+        with self._different_user(email="%s@galaxy.org" % self.username):
+            with self.dataset_populator.test_history() as history_id:
+                run_response = self.dataset_populator.run_tool(tool_id=DATA_MANAGER_MANUAL_ID,
+                                                               inputs=DATA_MANAGER_MANUAL_INPUT,
+                                                               history_id=history_id,
+                                                               assert_ok=False)
+                self.dataset_populator.wait_for_tool_run(history_id=history_id, run_response=run_response, timeout=CONDA_AUTO_INSTALL_JOB_TIMEOUT)
+
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert 'dm6' in entries
+
+        self._app.tool_data_tables.get("all_fasta").remove_entry(self._app.tool_data_tables.get("all_fasta").to_dict(view="element")['fields'][0])
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('dbkey', 'dm6', 'dbkey')
+        assert entries is None
+
+    def test_data_manager_manual_refgenie_dbkeys(self):
+        """
+        Test that data_manager_manual works with refgenie enabled, with a table defined first by refgenie
+        """
+        self.install_repository('iuc', 'data_manager_manual', '1ed87dee9e68')
+        with self._different_user(email="%s@galaxy.org" % self.username):
+            with self.dataset_populator.test_history() as history_id:
+                run_response = self.dataset_populator.run_tool(tool_id=DATA_MANAGER_MANUAL_ID,
+                                                               inputs=DATA_MANAGER_MANUAL_INPUT_DBKEY,
+                                                               history_id=history_id,
+                                                               assert_ok=False)
+                self.dataset_populator.wait_for_tool_run(history_id=history_id, run_response=run_response, timeout=CONDA_AUTO_INSTALL_JOB_TIMEOUT)
+
+        entries = self._app.tool_data_tables.get("__dbkeys__").get_entries('name', 'dm7', 'name')
+        assert 'dm7' in entries
+
+        self._app.tool_data_tables.get("__dbkeys__").remove_entry(self._app.tool_data_tables.get("__dbkeys__").to_dict(view="element")['fields'][0])
+        entries = self._app.tool_data_tables.get("all_fasta").get_entries('name', 'dm7', 'name')
+        assert entries is None
+
+    @classmethod
+    def get_secure_ascii_digits(cls, n=12):
+        return ''.join(random.SystemRandom().choice(string.ascii_lowercase + string.digits) for _ in range(12))
diff --git a/test/integration/test_flush_per_n_datasets.py b/test/integration/test_flush_per_n_datasets.py
new file mode 100644
index 00000000000..8568f9a8776
--- /dev/null
+++ b/test/integration/test_flush_per_n_datasets.py
@@ -0,0 +1,19 @@
+"""Integration tests for the flush_per_n_datasets setting."""
+from galaxy_test.driver import integration_util
+
+
+class FlushPerNDatasetsTestCase(integration_util.IntegrationInstance):
+    """Describe a Galaxy test instance with embedded pulsar configured."""
+
+    framework_tool_and_types = True
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        config["flush_per_n_datasets"] = 1
+
+
+instance = integration_util.integration_module_instance(FlushPerNDatasetsTestCase)
+test_tools = integration_util.integration_tool_runner([
+    'collection_creates_dynamic_nested',
+    'collection_creates_dynamic_list_of_pairs'
+])
diff --git a/test/integration/test_pulsar_embedded_containers.py b/test/integration/test_pulsar_embedded_containers.py
index 512ea229ed7..08c2dfe8339 100644
--- a/test/integration/test_pulsar_embedded_containers.py
+++ b/test/integration/test_pulsar_embedded_containers.py
@@ -46,3 +46,10 @@ class EmbeddedSingularityPulsarIntegrationTestCase(BaseEmbeddedPulsarContainerIn
 class EmbeddedDockerPulsarIntegrationTestCase(BaseEmbeddedPulsarContainerIntegrationTestCase, MulledJobTestCases):
     job_config_file = EMBEDDED_PULSAR_JOB_CONFIG_FILE_DOCKER
     container_type = 'docker'
+
+
+instance = integration_util.integration_module_instance(EmbeddedSingularityPulsarIntegrationTestCase)
+
+test_tools = integration_util.integration_tool_runner([
+    "tool_directory_docker",
+])
diff --git a/test/integration/test_remote_files_posix.py b/test/integration/test_remote_files_posix.py
new file mode 100644
index 00000000000..f94ef24f4b7
--- /dev/null
+++ b/test/integration/test_remote_files_posix.py
@@ -0,0 +1,135 @@
+# Before running this test, start nginx+webdav in Docker using following command:
+# docker run -v `pwd`/test/integration/webdav/data:/media  -e WEBDAV_USERNAME=alice -e WEBDAV_PASSWORD=secret1234 -p 7083:7083 jmchilton/webdavdev
+# Apache Docker host (shown next) doesn't work because displayname not set in response.
+# docker run -v `pwd`/test/integration/webdav:/var/lib/dav  -e AUTH_TYPE=Basic -e USERNAME=alice -e PASSWORD=secret1234  -e LOCATION=/ -p 7083:80 bytemark/webdav
+
+import os
+import shutil
+from tempfile import mkdtemp
+
+from galaxy_test.base import api_asserts
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import integration_util
+
+REQUIRED_ROLE = "user@bx.psu.edu"
+REQUIRED_GROUP = "fs_test_group"
+
+
+def get_posix_file_source_config(root_dir: str, roles: str, groups: str) -> str:
+    return f"""
+- type: posix
+  id: posix_test
+  label: Posix
+  doc: Files from local path
+  root: {root_dir}
+  writable: true
+  requires_roles: {roles}
+  requires_groups: {groups}
+
+"""
+
+
+def create_file_source_config_file_on(temp_dir, root_dir):
+    file_contents = get_posix_file_source_config(root_dir, REQUIRED_ROLE, REQUIRED_GROUP)
+    file_path = os.path.join(temp_dir, "file_sources_conf_posix.yml")
+    with open(file_path, "w") as f:
+        f.write(file_contents)
+    return file_path
+
+
+class PosixFileSourceIntegrationTestCase(integration_util.IntegrationTestCase):
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        temp_dir = os.path.realpath(mkdtemp())
+        cls._test_driver.temp_directories.append(temp_dir)
+        cls.root_dir = os.path.join(temp_dir, "root")
+
+        file_sources_config_file = create_file_source_config_file_on(temp_dir, cls.root_dir)
+        config["file_sources_config_file"] = file_sources_config_file
+
+        # Disable all stock plugins
+        config["ftp_upload_dir"] = None
+        config["library_import_dir"] = None
+        config["user_library_import_dir"] = None
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+        self._write_file_fixtures()
+
+    def test_plugin_config(self):
+        plugin_config_response = self.galaxy_interactor.get("remote_files/plugins")
+        api_asserts.assert_status_code_is_ok(plugin_config_response)
+        plugins = plugin_config_response.json()
+        assert len(plugins) == 1
+        assert plugins[0]["type"] == "posix"
+        assert plugins[0]["uri_root"] == "gxfiles://posix_test"
+        assert plugins[0]["writable"] is True
+        assert plugins[0]["requires_roles"] == REQUIRED_ROLE
+        assert plugins[0]["requires_groups"] == REQUIRED_GROUP
+
+    def test_allow_admin_access(self):
+        data = {"target": "gxfiles://posix_test"}
+        list_response = self.galaxy_interactor.get("remote_files", data, admin=True)
+        self._assert_list_response_matches_fixtures(list_response)
+
+    def test_user_access(self):
+        data = {"target": "gxfiles://posix_test"}
+        group_id = self._create_group(REQUIRED_GROUP)
+
+        # User has role but not group
+        list_response = self.galaxy_interactor.get("remote_files", data)
+        self._assert_access_forbidden_response(list_response)
+
+        # User has role and group
+        user_id = self.dataset_populator.user_id()
+        self._add_user_to_group(group_id, user_id)
+        list_response = self.galaxy_interactor.get("remote_files", data)
+        self._assert_list_response_matches_fixtures(list_response)
+
+    def _create_group(self, group_name: str):
+        payload = {
+            "name": group_name,
+            "user_ids": [],
+        }
+        response = self._post("groups", payload, admin=True, json=True)
+        self._assert_status_code_is(response, 200)
+        group = response.json()[0]  # POST /api/groups returns a list
+        return group["id"]
+
+    def _add_user_to_group(self, group_id, user_id):
+        update_response = self._put(f"groups/{group_id}/users/{user_id}", admin=True)
+        self._assert_status_code_is_ok(update_response)
+
+    def _assert_list_response_matches_fixtures(self, list_response):
+        api_asserts.assert_status_code_is_ok(list_response)
+        remote_files = list_response.json()
+        assert len(remote_files) == 2
+        if remote_files[0]["class"] == "Directory":
+            dir = remote_files[0]
+            file = remote_files[1]
+        else:
+            dir = remote_files[1]
+            file = remote_files[0]
+        assert file["name"] == "a"
+        assert dir["name"] == "subdir1"
+
+    def _assert_access_forbidden_response(self, response):
+        api_asserts.assert_status_code_is(response, 403)
+
+    def _write_file_fixtures(self):
+        root = PosixFileSourceIntegrationTestCase.root_dir
+        if os.path.exists(root):
+            shutil.rmtree(root)
+        os.mkdir(root)
+
+        with open(os.path.join(root, "a"), "w") as f:
+            f.write("a\n")
+
+        subdir1 = os.path.join(root, "subdir1")
+        os.mkdir(subdir1)
+        with open(os.path.join(subdir1, "b"), "w") as f:
+            f.write("b\n")
+
+        return root
diff --git a/test/integration/test_save_job_id_on_datasets.py b/test/integration/test_save_job_id_on_datasets.py
new file mode 100644
index 00000000000..3859f4e247f
--- /dev/null
+++ b/test/integration/test_save_job_id_on_datasets.py
@@ -0,0 +1,42 @@
+"""
+A Dataset should have a reference to the Job that created it.
+Here we test the creation of this reference in various contexts:
+- job creates one dataset
+- job creates multiple datasets
+- job uploads a dataset
+- job creates dynamically discovered datasets (after the tool is run)
+"""
+
+import pytest
+
+from galaxy import model
+from galaxy_test.driver.driver_util import GalaxyTestDriver
+
+
+class TestConfig:
+    framework_tool_and_types = True
+
+
+TEST_TOOL_IDS = [
+    'boolean_conditional',  # 1 job >> 1 dataset
+    'color_param',          # 1 job >> multiple datasets
+    'multi_output',         # 1 job >> 1 dataset + 1 discovered dataset
+    # test upload?            # not implemented
+]
+
+
+@pytest.mark.parametrize('tool_id', TEST_TOOL_IDS)
+def test_tool_datasets(tool_id):
+    driver = GalaxyTestDriver()
+    driver.setup(TestConfig)
+    driver.run_tool_test(tool_id)
+    session = driver.app.model.context.current
+    job = session.query(model.Job).order_by(model.Job.id.desc()).first()
+    datasets = session.query(model.Dataset).filter(model.Dataset.job_id == job.id).all()
+
+    if tool_id == 'boolean_conditional':
+        assert len(datasets) == 1
+    elif tool_id in ('color_param', 'multi_output'):
+        assert len(datasets) == 2
+
+    driver.tear_down()
diff --git a/test/integration_selenium/test_user_library_permissions.py b/test/integration_selenium/test_user_library_permissions.py
index 5bcb1a1ca97..94db0287507 100644
--- a/test/integration_selenium/test_user_library_permissions.py
+++ b/test/integration_selenium/test_user_library_permissions.py
@@ -86,14 +86,15 @@ class TestUserLibraryImport(SeleniumIntegrationTestCase):
         self.libraries_index_search_for(self.name)
         # open permission manage dialog
         self.components.libraries.permission_library_btn.wait_for_and_click()
-        self.components.libraries.add_items_permission_field.wait_for_and_click()
+
         # search for created user and add him to permission field
-        self.components.libraries.add_items_permission_field.wait_for_and_send_keys(email)
+        self.components.libraries.add_items_permission.wait_for_and_click()
+        self.components.libraries.add_items_permission_input_field.wait_for_and_send_keys(email)
         self.components.libraries.add_items_permission_option.wait_for_and_click()
 
         # assert that the right email has been saved
-        self.components.libraries.add_items_permission_field_text(email=email).wait_for_visible()
-
+        allowed_user_email = self.components.libraries.add_items_permission_field_text.wait_for_text()
+        assert allowed_user_email == email
         self.components.libraries.toolbtn_save_permissions.wait_for_and_click()
         # assert that toast message is appearing
         self.components.libraries.folder.toast_msg.wait_for_visible()
diff --git a/test/release.sh b/test/release.sh
new file mode 100755
index 00000000000..fcb6b1f8f99
--- /dev/null
+++ b/test/release.sh
@@ -0,0 +1,308 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Necessary for testing the release script
+export TEST_MODE=true
+
+: ${ORIGIN:=origin}
+: ${STABLE_BRANCH:=master}
+
+REPO_ROOT=
+FORK_ROOT=$(mktemp -d -t galaxy_release_test_XXXXXXXX)
+DEV_BRANCH="$(git branch --show-current)"
+
+TEST_RELEASE_PREV=
+TEST_RELEASE_PREV_MINOR=
+TEST_RELEASE_CURR='99.01'
+TEST_RELEASE_NEXT='99.05'
+TEST_RELEASE_NEXT_NEXT='99.09'
+
+: ${VENV:=${FORK_ROOT}/venv}
+export VENV
+
+[ -n "$DEV_BRANCH" ] || { echo 'ERROR: Cannot determine current branch'; exit 1; }
+
+
+function trap_handler() {
+    [ -z "$FORK_ROOT" ] || rm -rf "$FORK_ROOT"
+}
+trap "trap_handler" EXIT
+
+
+function log() {
+    [ -t 0 ] && echo -e '\033[1;35m#' "$@" '\033[0m' 1>&2 || echo '#' "$@" 1>&2
+}
+
+
+function log_exec() {
+    local rc
+    set -x
+    "$@"
+    { rc=$?; set +x; } 2>/dev/null
+    return $rc
+}
+
+
+function log_function() {
+    local func_name="$1"; shift
+    log ">>>> ${func_name}()"
+    $func_name "$@"
+    log "<<<< ${func_name}()"
+}
+
+
+function get_repo_root() {
+    (
+        cd "$(dirname "$0")/.."
+        pwd
+    )
+}
+
+
+function get_stable_version() {
+    local part="$1"
+    (
+        cd_fork work
+        local restore_branch="$(git branch --show-current)"
+        git checkout -q --no-track -b __stable_version_check "upstream/${STABLE_BRANCH}"
+        grep "^VERSION_${part}" lib/galaxy/version.py | sed -E -e "s/^[^'\"]*['\"]([^'\"]*)['\"]$/\1/"
+        git checkout -q "$restore_branch"
+        git branch -q -D __stable_version_check
+    )
+}
+
+
+function cd_fork() {
+    log_exec cd "${FORK_ROOT}/${1}"
+}
+
+
+function make_forks() {
+    [ -n "$REPO_ROOT" ] || REPO_ROOT=$(get_repo_root)
+
+    # Use a "work" clone to prevent modifications to current clone
+    git clone --no-checkout "${REPO_ROOT}" "${FORK_ROOT}/work"
+    (
+        cd_fork work
+        log "Checking out ref '${DEV_BRANCH}' as 'dev'"
+        log_exec git checkout --no-track -b dev "$DEV_BRANCH"
+    )
+
+    # Create bare origin and upstream repos 
+    for repo in origin upstream; do
+        log_exec git clone --bare "${FORK_ROOT}/work" "${FORK_ROOT}/${repo}"
+        (
+            cd_fork "$repo"
+            log_exec git remote remove origin
+        )
+    done
+
+    # Set remotes on work repo
+    (
+        cd_fork work
+        git remote remove origin
+        for repo in origin upstream; do
+            log_exec git remote add "$repo" "file://${FORK_ROOT}/${repo}"
+        done
+    )
+
+    # Fetch release branches to upstream repo
+    (
+        cd_fork upstream
+        log_exec git fetch --no-tags "${REPO_ROOT}" refs/remotes/upstream/${STABLE_BRANCH}:${STABLE_BRANCH}
+    )
+
+    # Set current (previous) stable release from stable branch
+    (
+        cd_fork work
+        git fetch --no-tags upstream
+    )
+    TEST_RELEASE_PREV=$(get_stable_version MAJOR)
+    TEST_RELEASE_PREV_MINOR=$(get_stable_version MINOR)
+}
+
+
+function create_venv() {
+    if [ ! -d "$VENV" ]; then
+        log_exec python3 -m venv "$VENV"
+        log_exec "${VENV}/bin/pip" install wheel packaging
+    fi
+    . "${VENV}/bin/activate"
+}
+
+
+function verify_version() {
+    local major="$1"
+    local minor="$2"
+    local ref="$3"
+    local _ref="$3"
+    local restore_branch="$(git branch --show-current)"
+    [ -n "$(git tag -l $ref)" ]  || _ref="upstream/${ref}"
+    log_exec git checkout --no-track -b "__${ref}" "$_ref"
+    if grep -q "^VERSION_MAJOR = \"${major}\"$" lib/galaxy/version.py; then
+        log "**** Major version '${major}' is correct at ref '${ref}'"
+    else
+        log "**** Major version '${major}' is incorrect at ref '${ref}':"
+        log "$(grep '^VERSION_MAJOR' lib/galaxy/version.py)"
+        exit 1
+    fi
+    if grep -q "^VERSION_MINOR = \"${minor}\"$" lib/galaxy/version.py; then
+        log "**** Minor version '${minor}' is correct at ref '${ref}'"
+    else
+        log "**** Minor version '${minor}' is incorrect at ref '${ref}':"
+        log "$(grep '^VERSION_MINOR' lib/galaxy/version.py)"
+        exit 1
+    fi
+    log_exec git checkout "$restore_branch"
+    log_exec git branch -D "__${ref}"
+}
+
+
+function verify_makefile_version() {
+    local major="$1"
+    local ref="$2"
+    local _ref="$2"
+    local restore_branch="$(git branch --show-current)"
+    [ -n "$(git tag -l $ref)" ]  || _ref="upstream/${ref}"
+    log_exec git checkout --no-track -b "__${ref}" "$_ref"
+    if grep -q "^RELEASE_CURR:=${major}$" Makefile; then
+        log "**** RELEASE_CURR '${major}' is correct in Makefile at ref '${ref}'"
+    else
+        log "**** RELEASE_CURR '${major}' is incorrect in Makefile at ref '${ref}':"
+        log "$(grep '^RELEASE_CURR' Makefile)"
+        exit 1
+    fi
+    log_exec git checkout "$restore_branch"
+    log_exec git branch -D "__${ref}"
+}
+
+
+function test_rc() {
+    log "Test creation of ${TEST_RELEASE_CURR}.rc1..."
+    (
+        cd_fork work
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_CURR"
+        # simulate merging RC PRs
+        log_exec git push upstream refs/remotes/origin/version-${TEST_RELEASE_CURR}.rc1:refs/heads/release_${TEST_RELEASE_CURR}
+        log_exec git push upstream refs/remotes/origin/version-${TEST_RELEASE_NEXT}.dev:refs/heads/dev
+
+        # verify        major                   minor                       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_CURR"    'rc1'                       "release_${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_NEXT"    'dev0'                      'dev'
+        verify_version  "$TEST_RELEASE_PREV"    "$TEST_RELEASE_PREV_MINOR"  "$STABLE_BRANCH"  # should not have changed
+        verify_makefile_version "$TEST_RELEASE_NEXT" 'dev'
+    )
+}
+
+
+function test_rc_point() {
+    log "Test creation of ${TEST_RELEASE_CURR}.rc2..."
+    (
+        cd_fork work
+        log_exec "${REPO_ROOT}/scripts/release.sh" -c -r "$TEST_RELEASE_CURR"
+        # verify        major                   minor                       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_CURR"    'rc2'                       "release_${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_NEXT"    'dev0'                      'dev'
+        verify_version  "$TEST_RELEASE_PREV"    "$TEST_RELEASE_PREV_MINOR"  "$STABLE_BRANCH"  # should not have changed
+        verify_makefile_version "$TEST_RELEASE_NEXT" 'dev'
+    )
+}
+
+
+function test_initial() {
+    log "Test creation of ${TEST_RELEASE_CURR} initial (.0)..."
+    (
+        cd_fork work
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_CURR"
+        # re-fetch from upstream to ensure tags are correct
+        log_exec git tag -d $(git tag -l)
+        log_exec git fetch upstream
+
+        # verify        major                   minor       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_CURR"    ''          "v${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_CURR"    '1.dev0'    "release_${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_NEXT"    'dev0'      'dev'
+        verify_version  "$TEST_RELEASE_CURR"    ''          "$STABLE_BRANCH"
+        verify_makefile_version "$TEST_RELEASE_NEXT" 'dev'
+    )
+}
+
+
+function test_point() {
+    log "Test creation of ${TEST_RELEASE_CURR}.1..."
+    (
+        cd_fork work
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_CURR"
+        log_exec git tag -d $(git tag -l)
+        log_exec git fetch upstream
+
+        # verify        major                   minor       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_CURR"    '1'         "$STABLE_BRANCH"
+        verify_version  "$TEST_RELEASE_CURR"    '1'         "v${TEST_RELEASE_CURR}.1"
+        verify_version  "$TEST_RELEASE_CURR"    '2.dev0'    "release_${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_NEXT"    'dev0'      'dev'
+        verify_makefile_version "$TEST_RELEASE_NEXT" 'dev'
+    )
+}
+
+
+function test_next() {
+    log "Test creation of ${TEST_RELEASE_NEXT} rc1 -> initial (.0)..."
+    (
+        cd_fork work
+        # create RC
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_NEXT"
+        # simulate merging RC PRs
+        log_exec git push upstream refs/remotes/origin/version-${TEST_RELEASE_NEXT}.rc1:refs/heads/release_${TEST_RELEASE_NEXT}
+        log_exec git push upstream refs/remotes/origin/version-${TEST_RELEASE_NEXT_NEXT}.dev:refs/heads/dev
+        # create initial
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_NEXT"
+        log_exec git tag -d $(git tag -l)
+        log_exec git fetch upstream
+
+        # verify        major                       minor       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_NEXT"        ''          "$STABLE_BRANCH"
+        verify_version  "$TEST_RELEASE_NEXT"        ''          "v${TEST_RELEASE_NEXT}"
+        verify_version  "$TEST_RELEASE_NEXT"        '1.dev0'    "release_${TEST_RELEASE_NEXT}"
+        verify_version  "$TEST_RELEASE_NEXT_NEXT"   'dev0'      'dev'
+        verify_makefile_version "$TEST_RELEASE_NEXT" "release_${TEST_RELEASE_NEXT}"
+        verify_makefile_version "$TEST_RELEASE_NEXT_NEXT" 'dev'
+    )
+}
+
+
+function test_prev() {
+    log "Test creation of ${TEST_RELEASE_CURR}.2..."
+    (
+        cd_fork work
+        log_exec "${REPO_ROOT}/scripts/release.sh" -r "$TEST_RELEASE_CURR"
+        log_exec git tag -d $(git tag -l)
+        log_exec git fetch upstream
+
+        # verify        major                       minor       ref (branch/tag)
+        verify_version  "$TEST_RELEASE_NEXT"        ''          "$STABLE_BRANCH"
+        verify_version  "$TEST_RELEASE_CURR"        '2'         "v${TEST_RELEASE_CURR}.2"
+        verify_version  "$TEST_RELEASE_CURR"        '3.dev0'    "release_${TEST_RELEASE_CURR}"
+        verify_version  "$TEST_RELEASE_NEXT"        '1.dev0'    "release_${TEST_RELEASE_NEXT}"
+        verify_version  "$TEST_RELEASE_NEXT_NEXT"   'dev0'      'dev'
+        verify_makefile_version "$TEST_RELEASE_NEXT" "release_${TEST_RELEASE_NEXT}"
+        verify_makefile_version "$TEST_RELEASE_NEXT_NEXT" 'dev'
+    )
+}
+
+
+function main() {
+    log "TIP: test output is magenta, release script output is green/red"
+    log_function make_forks
+    log_function create_venv
+    log_function test_rc
+    log_function test_rc_point
+    log_function test_initial
+    log_function test_point
+    log_function test_next
+    log_function test_prev
+    log "OK"
+}
+
+
+main
diff --git a/test/unit/authnz/test_custos_authnz.py b/test/unit/authnz/test_custos_authnz.py
index a85081c6dd2..e42deef9e86 100644
--- a/test/unit/authnz/test_custos_authnz.py
+++ b/test/unit/authnz/test_custos_authnz.py
@@ -334,10 +334,13 @@ class CustosAuthnzTestCase(unittest.TestCase):
         self.test_nonce_hash = self.test_nonce_hash + "Z"
 
         # self.custos_authnz._fetch_token = fetch_token
-        with self.assertRaises(Exception):
-            self.custos_authnz.callback(state_token="xxx",
-                                      authz_code=self.test_code, trans=self.trans,
-                                      login_redirect_url="http://localhost:8000/")
+        with self.assertRaisesRegex(Exception, "^Nonce mismatch!$"):
+            self.custos_authnz.callback(
+                state_token="xxx",
+                authz_code=self.test_code,
+                trans=self.trans,
+                login_redirect_url="http://localhost:8000/"
+            )
         self.assertTrue(self._fetch_token_called)
         self.assertFalse(self._get_userinfo_called)
 
diff --git a/test/unit/config/config_manage/1607_root_filters/config/tool_shed.ini b/test/unit/config/config_manage/1607_root_filters/config/tool_shed.ini
index 259cff85fb5..a7181d917b6 100644
--- a/test/unit/config/config_manage/1607_root_filters/config/tool_shed.ini
+++ b/test/unit/config/config_manage/1607_root_filters/config/tool_shed.ini
@@ -29,7 +29,7 @@ prefix = /shed
 filter-with = proxy-prefix
 
 # Specifies the factory for the universe WSGI application
-paste.app_factory = galaxy.webapps.tool_shed.buildapp:app_factory
+paste.app_factory = tool_shed.webapp.buildapp:app_factory
 
 # Verbosity of console log messages.  Acceptable values can be found here:
 # https://docs.python.org/2/library/logging.html#logging-levels
@@ -185,4 +185,4 @@ paste.app_factory = galaxy.webapps.tool_shed.buildapp:app_factory
 #static_style_dir = static/style/blue
 
 # Sentry (getsentry.com) DSN for catching bugs.
-#sentry_dsn = None
\ No newline at end of file
+#sentry_dsn = None
diff --git a/test/unit/config/config_manage/1607_root_samples/config/reports.ini b/test/unit/config/config_manage/1607_root_samples/config/reports.ini
index 8a3a3dd8d90..4060a1223de 100644
--- a/test/unit/config/config_manage/1607_root_samples/config/reports.ini
+++ b/test/unit/config/config_manage/1607_root_samples/config/reports.ini
@@ -44,7 +44,7 @@ log_level = DEBUG
 # Database connection
 # Galaxy reports are intended for production Galaxy instances, so sqlite is not supported.
 # You may use a SQLAlchemy connection string to specify an external database.
-#database_connection = postgres:///galaxy_test?user=postgres&password=postgres
+#database_connection = postgresql:///galaxy_test?user=postgres&password=postgres
 
 # Where dataset files are saved
 #file_path = database/files
@@ -91,4 +91,4 @@ session_secret = changethisinproduction
 # static_style_dir = %(here)s/static/june_2007_style/blue
 
 # Sentry (getsentry.com) DSN for catching bugs.
-#sentry_dsn = None
\ No newline at end of file
+#sentry_dsn = None
diff --git a/test/unit/config/config_manage/1607_root_samples/config/tool_shed.ini b/test/unit/config/config_manage/1607_root_samples/config/tool_shed.ini
index 9b069898132..32ec384beb6 100644
--- a/test/unit/config/config_manage/1607_root_samples/config/tool_shed.ini
+++ b/test/unit/config/config_manage/1607_root_samples/config/tool_shed.ini
@@ -22,7 +22,7 @@ threadpool_kill_thread_limit = 10800
 [app:main]
 
 # Specifies the factory for the universe WSGI application
-paste.app_factory = galaxy.webapps.tool_shed.buildapp:app_factory
+paste.app_factory = tool_shed.webapp.buildapp:app_factory
 
 # Verbosity of console log messages.  Acceptable values can be found here:
 # https://docs.python.org/2/library/logging.html#logging-levels
@@ -178,4 +178,4 @@ paste.app_factory = galaxy.webapps.tool_shed.buildapp:app_factory
 #static_style_dir = static/style/blue
 
 # Sentry (getsentry.com) DSN for catching bugs.
-#sentry_dsn = None
\ No newline at end of file
+#sentry_dsn = None
diff --git a/test/unit/config/test_load_config.py b/test/unit/config/test_load_config.py
index b94beee6048..ce0bb90df07 100644
--- a/test/unit/config/test_load_config.py
+++ b/test/unit/config/test_load_config.py
@@ -13,6 +13,12 @@ MOCK_SCHEMA = {
 }
 
 
+MOCK_SCHEMA_DBURL = {
+    'database_connection': {'type': 'str'},
+    'install_database_connection': {'type': 'str'},
+}
+
+
 def get_schema(app_mapping):
     return {'mapping': {'_': {'mapping': app_mapping}}}
 
@@ -23,6 +29,11 @@ def mock_init(monkeypatch):
     monkeypatch.setattr(AppSchema, '_read_schema', lambda a, b: get_schema(MOCK_SCHEMA))
 
 
+@pytest.fixture
+def mock_init_dburl(mock_init, monkeypatch):
+    monkeypatch.setattr(AppSchema, '_read_schema', lambda a, b: get_schema(MOCK_SCHEMA_DBURL))
+
+
 def test_load_config_from_schema(mock_init):
     config = BaseAppConfiguration()
 
@@ -138,3 +149,21 @@ def test_is_set(mock_init):
     assert config.is_set('property4')
     assert config.is_set('property4')
     assert config.is_set('property6')
+
+
+def test_deprecated_postgres_urls_are_fixed(mock_init_dburl):
+    error_message = '"postgres" prefix should become "postgresql"'
+
+    config = BaseAppConfiguration(
+        database_connection='postgres://foo',  # incorrect
+        install_database_connection='postgresql://foo')  # correct
+
+    assert config.database_connection == 'postgresql://foo', error_message
+    assert config.install_database_connection == 'postgresql://foo'
+
+    config = BaseAppConfiguration(
+        database_connection='postgresql+psycopg2://foo',  # correct
+        install_database_connection='postgres+psycopg2://foo')  # incorrect
+
+    assert config.database_connection == 'postgresql+psycopg2://foo', error_message
+    assert config.install_database_connection == 'postgresql+psycopg2://foo'
diff --git a/test/unit/data/test_galaxy_mapping.py b/test/unit/data/test_galaxy_mapping.py
index 2db5e6fe9d6..94064615a2d 100644
--- a/test/unit/data/test_galaxy_mapping.py
+++ b/test/unit/data/test_galaxy_mapping.py
@@ -5,11 +5,11 @@ import uuid
 
 import pytest
 from sqlalchemy import inspect
-from sqlalchemy_utils import create_database
 
 import galaxy.datatypes.registry
 import galaxy.model
 import galaxy.model.mapping as mapping
+from galaxy.model.database_utils import create_database
 from galaxy.model.security import GalaxyRBACAgent
 
 datatypes_registry = galaxy.datatypes.registry.Registry()
@@ -386,6 +386,15 @@ class MappingTests(BaseModelTestCase):
         assert d.metadata.anyAttribute is None
         assert 'items' not in d.metadata
 
+    def test_dataset_job_relationship(self):
+        model = self.model
+        dataset = model.Dataset()
+        job = model.Job()
+        dataset.job = job
+        self.persist(job, dataset)
+        loaded_dataset = model.session.query(model.Dataset).filter(model.Dataset.id == dataset.id).one()
+        assert loaded_dataset.job_id == job.id
+
     def test_jobs(self):
         model = self.model
         u = model.User(email="jobtest@foo.bar.baz", password="password")
diff --git a/test/unit/files/_util.py b/test/unit/files/_util.py
index cd1f2627102..ec2a101c847 100644
--- a/test/unit/files/_util.py
+++ b/test/unit/files/_util.py
@@ -47,7 +47,7 @@ def list_dir(file_sources, uri, recursive, user_context=None):
     return res
 
 
-def user_context_fixture(user_ftp_dir=None):
+def user_context_fixture(user_ftp_dir=None, role_names=None, group_names=None, is_admin=False):
     user_context = DictFileSourcesUserContext(
         username=TEST_USERNAME,
         email=TEST_EMAIL,
@@ -55,7 +55,10 @@ def user_context_fixture(user_ftp_dir=None):
         preferences={
             'webdav|password': 'secret1234',
             'dropbox|access_token': os.environ.get('GALAXY_TEST_DROPBOX_ACCESS_TOKEN'),
-        }
+        },
+        role_names=role_names or set(),
+        group_names=group_names or set(),
+        is_admin=is_admin,
     )
     return user_context
 
diff --git a/test/unit/files/test_posix.py b/test/unit/files/test_posix.py
index b139b1014f4..0a87a7646b2 100644
--- a/test/unit/files/test_posix.py
+++ b/test/unit/files/test_posix.py
@@ -1,7 +1,10 @@
 import os
 import tempfile
 
+import pytest
+
 from galaxy.datatypes import sniff
+from galaxy.exceptions import ItemAccessibilityException
 from galaxy.files import (
     ConfiguredFileSources,
     ConfiguredFileSourcesConfig,
@@ -254,6 +257,129 @@ def test_user_import_dir_implicit_config():
     assert_realizes_as(file_sources, "gxuserimport://a", "a\n", user_context=user_context)
 
 
+def test_posix_user_access_requires_role():
+    allowed_role_name = "role1"
+    plugin_extra_config = {
+        "requires_roles": allowed_role_name,
+    }
+    file_sources = _configured_file_sources(writable=True, plugin_extra_config=plugin_extra_config)
+
+    user_context = user_context_fixture()
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(role_names=set([allowed_role_name]))
+    _assert_user_access_granted(file_sources, user_context)
+
+
+def test_posix_user_access_requires_group():
+    allowed_group_name = "group1"
+    plugin_extra_config = {
+        "requires_groups": allowed_group_name,
+    }
+    file_sources = _configured_file_sources(writable=True, plugin_extra_config=plugin_extra_config)
+
+    user_context = user_context_fixture()
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(group_names=set([allowed_group_name]))
+    _assert_user_access_granted(file_sources, user_context)
+
+
+def test_posix_admin_user_has_access():
+    plugin_extra_config = {
+        "requires_roles": "role1",
+        "requires_groups": "group1",
+    }
+    file_sources = _configured_file_sources(writable=True, plugin_extra_config=plugin_extra_config)
+
+    user_context = user_context_fixture()
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(is_admin=True)
+    _assert_user_access_granted(file_sources, user_context)
+
+
+def test_posix_user_access_requires_role_and_group():
+    allowed_group_name = "group1"
+    allowed_role_name = "role1"
+    plugin_extra_config = {
+        "requires_roles": allowed_role_name,
+        "requires_groups": allowed_group_name,
+    }
+    file_sources = _configured_file_sources(writable=True, plugin_extra_config=plugin_extra_config)
+
+    user_context = user_context_fixture(group_names=set([allowed_group_name]))
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(role_names=set([allowed_role_name]))
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(role_names=set([allowed_role_name]), group_names=set([allowed_group_name]))
+    _assert_user_access_granted(file_sources, user_context)
+
+
+def test_posix_user_access_using_boolean_rules():
+    plugin_extra_config = {
+        "requires_roles": "role1 and (role2 or role3)",
+        "requires_groups": "group1 and group2 and not group3",
+    }
+    file_sources = _configured_file_sources(writable=True, plugin_extra_config=plugin_extra_config)
+
+    user_context = user_context_fixture(
+        role_names=set([]),
+        group_names=set([])
+    )
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(
+        role_names=set(["role1"]),
+        group_names=set(["group1", "group2"])
+    )
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(
+        role_names=set(["role1", "role3"]),
+        group_names=set(["group1", "group2", "group3"])
+    )
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(
+        role_names=set(["role1", "role2"]),
+        group_names=set(["group3", "group5"])
+    )
+    _assert_user_access_prohibited(file_sources, user_context)
+
+    user_context = user_context_fixture(
+        role_names=set(["role1", "role3"]),
+        group_names=set(["group1", "group2"])
+    )
+    _assert_user_access_granted(file_sources, user_context)
+
+
+def _assert_user_access_prohibited(file_sources, user_context):
+    with pytest.raises(ItemAccessibilityException):
+        list_root(file_sources, "gxfiles://test1", recursive=False, user_context=user_context)
+
+    with pytest.raises(ItemAccessibilityException):
+        write_from(file_sources, "gxfiles://test1/b", "my test content", user_context=user_context)
+
+    with pytest.raises(ItemAccessibilityException):
+        assert_realizes_as(file_sources, "gxfiles://test1/a", "a\n", user_context=user_context)
+
+
+def _assert_user_access_granted(file_sources, user_context):
+    res = list_root(file_sources, "gxfiles://test1", recursive=False, user_context=user_context)
+    assert res
+
+    write_from(file_sources, "gxfiles://test1/b", "my test content", user_context=user_context)
+
+    res = list_root(file_sources, "gxfiles://test1", recursive=False, user_context=user_context)
+    b = find(res, name="b")
+    assert b is not None, b
+
+    assert_realizes_as(file_sources, "gxfiles://test1/a", "a\n", user_context=user_context)
+
+
 def _configured_file_sources(include_allowlist=False, plugin_extra_config=None, per_user=False, writable=None):
     tmp, root = _setup_root()
     config_kwd = {}
diff --git a/test/unit/managers/test_HDAManager.py b/test/unit/managers/test_HDAManager.py
index 8f44aaeb47b..bdf491c1de1 100644
--- a/test/unit/managers/test_HDAManager.py
+++ b/test/unit/managers/test_HDAManager.py
@@ -175,7 +175,7 @@ class HDAManagerTestCase(HDATestCase):
 
         self.log("should purge an hda if config does allow")
         self.assertFalse(item1.purged)
-        self.assertEqual(self.hda_manager.purge(item1), item1)
+        self.hda_manager.purge(item1)
         self.assertTrue(item1.deleted)
         self.assertTrue(item1.purged)
 
diff --git a/test/unit/model/__init__.py b/test/unit/model/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/unit/model/common.py b/test/unit/model/common.py
new file mode 100644
index 00000000000..3f9386b5fe8
--- /dev/null
+++ b/test/unit/model/common.py
@@ -0,0 +1,47 @@
+import os
+
+import pytest
+from sqlalchemy.engine.url import make_url
+from sqlalchemy.sql.compiler import IdentifierPreparer
+
+from galaxy.model.database_utils import sqlalchemy_engine
+
+# GALAXY_TEST_CONNECT_POSTGRES_URI='postgresql://postgres@localhost:5432/postgres' pytest test/unit/model
+skip_if_not_postgres_uri = pytest.mark.skipif(
+    not os.environ.get('GALAXY_TEST_CONNECT_POSTGRES_URI'),
+    reason="GALAXY_TEST_CONNECT_POSTGRES_URI not set"
+)
+
+# GALAXY_TEST_CONNECT_MYSQL_URI='mysql+mysqldb://root@localhost/mysql' pytest test/unit/model
+skip_if_not_mysql_uri = pytest.mark.skipif(
+    not os.environ.get('GALAXY_TEST_CONNECT_MYSQL_URI'),
+    reason="GALAXY_TEST_CONNECT_MYSQL_URI not set"
+)
+
+
+def replace_database_in_url(url, database_name):
+    """
+    Substitute the database part of url for database_name.
+
+    Example: replace_database_in_url('foo/db1', 'db2') returns 'foo/db2'
+    This will not work for unix domain connections.
+    """
+    i = url.rfind('/')
+    return f'{url[:i]}/{database_name}'
+
+
+def drop_database(db_url, database):
+    """Drop database; connect with db_url.
+
+    Used only for test purposes to cleanup after creating a test database.
+    """
+    if db_url.startswith('postgresql') or db_url.startswith('mysql'):
+        with sqlalchemy_engine(db_url) as engine:
+            preparer = IdentifierPreparer(engine.dialect)
+            database = preparer.quote(database)
+            stmt = f'DROP DATABASE IF EXISTS {database}'
+            with engine.connect().execution_options(isolation_level='AUTOCOMMIT') as conn:
+                conn.execute(stmt)
+    else:
+        url = make_url(db_url)
+        os.remove(url.database)
diff --git a/test/unit/model/conftest.py b/test/unit/model/conftest.py
new file mode 100644
index 00000000000..02f5252c7b1
--- /dev/null
+++ b/test/unit/model/conftest.py
@@ -0,0 +1,24 @@
+import os
+import uuid
+
+import pytest
+
+
+@pytest.fixture
+def database_name():
+    return f'galaxytest_{uuid.uuid4().hex}'
+
+
+@pytest.fixture
+def postgres_url():
+    return os.environ.get('GALAXY_TEST_CONNECT_POSTGRES_URI')
+
+
+@pytest.fixture
+def mysql_url():
+    return os.environ.get('GALAXY_TEST_CONNECT_MYSQL_URI')
+
+
+@pytest.fixture
+def sqlite_memory_url():
+    return 'sqlite:///:memory:'
diff --git a/test/unit/model/test_database_utils.py b/test/unit/model/test_database_utils.py
new file mode 100644
index 00000000000..72cbf17c860
--- /dev/null
+++ b/test/unit/model/test_database_utils.py
@@ -0,0 +1,75 @@
+import os
+import tempfile
+
+from galaxy.model.database_utils import (
+    create_database,
+    database_exists,
+)
+from .common import (
+    drop_database,
+    replace_database_in_url,
+    skip_if_not_mysql_uri,
+    skip_if_not_postgres_uri,
+)
+
+
+@skip_if_not_postgres_uri
+def test_create_exists_postgres_database(database_name, postgres_url):
+    assert not database_exists(postgres_url, database_name)
+    create_database(postgres_url, database_name)
+    assert database_exists(postgres_url, database_name)
+    drop_database(postgres_url, database_name)
+    assert not database_exists(postgres_url, database_name)
+
+
+@skip_if_not_postgres_uri
+def test_create_exists_postgres_database__pass_as_url(database_name, postgres_url):
+    # the database in the url is the one to create/check
+    url = replace_database_in_url(postgres_url, database_name)
+
+    assert not database_exists(url)
+    create_database(url)
+    assert database_exists(url)
+    drop_database(postgres_url, database_name)
+    assert not database_exists(url)
+
+
+def test_create_exists_sqlite_database(database_name):
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        url = make_sqlite_url(tmp_dir, database_name)
+
+        assert not database_exists(url, database_name)
+        create_database(url, database_name)
+        assert database_exists(url, database_name)
+        drop_database(url, database_name)
+        assert not database_exists(url, database_name)
+
+
+def test_create_exists_sqlite_database__pass_as_url(database_name):
+    # the database in the url is the one to create/check
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        url = make_sqlite_url(tmp_dir, database_name)
+
+        assert not database_exists(url)
+        create_database(url)
+        assert database_exists(url)
+        drop_database(url, database_name)
+        assert not database_exists(url)
+
+
+def test_exists_sqlite_in_memory_database(database_name, sqlite_memory_url):
+    assert database_exists(sqlite_memory_url)
+
+
+@skip_if_not_mysql_uri
+def test_create_exists_mysql_database(database_name, mysql_url):
+    assert not database_exists(mysql_url, database_name)
+    create_database(mysql_url, database_name)
+    assert database_exists(mysql_url, database_name)
+    drop_database(mysql_url, database_name)
+    assert not database_exists(mysql_url, database_name)
+
+
+def make_sqlite_url(tmp_dir, database_name):
+    path = os.path.join(tmp_dir, database_name)
+    return f'sqlite:///{path}'
diff --git a/test/unit/model/test_views.py b/test/unit/model/test_views.py
new file mode 100644
index 00000000000..990b0c6c6db
--- /dev/null
+++ b/test/unit/model/test_views.py
@@ -0,0 +1,89 @@
+import pytest
+from sqlalchemy import (
+    Column,
+    Integer,
+    MetaData,
+    Table,
+)
+from sqlalchemy.sql import (
+    column,
+    text,
+)
+
+from galaxy.model.database_utils import (
+    create_database,
+    sqlalchemy_engine,
+)
+from galaxy.model.view.utils import (
+    CreateView,
+    View,
+)
+from .common import (
+    drop_database,
+    replace_database_in_url,
+    skip_if_not_mysql_uri,
+    skip_if_not_postgres_uri,
+)
+
+
+@pytest.fixture
+def view():
+    # A View class we would add to galaxy.model.view
+    class TestView(View):
+        name = 'testview'
+        __view__ = text('SELECT id, foo FROM testfoo').columns(
+            column('id', Integer),
+            column('foo', Integer)
+        )
+        pkeys = {'id'}
+        View._make_table(name, __view__, pkeys)
+
+    return TestView
+
+
+@skip_if_not_postgres_uri
+def test_postgres_create_view(database_name, postgres_url, view):
+    metadata = MetaData()
+    make_table(metadata)  # table from which the view will select
+    url = replace_database_in_url(postgres_url, database_name)
+    query = f"SELECT 1 FROM information_schema.views WHERE table_name = '{view.name}'"
+    create_database(postgres_url, database_name)
+    run_view_test(url, metadata, view, query)
+    drop_database(postgres_url, database_name)
+
+
+def test_sqlite_create_view(sqlite_memory_url, view):
+    metadata = MetaData()
+    make_table(metadata)  # table from which the view will select
+    url = sqlite_memory_url
+    query = f"SELECT 1 FROM sqlite_master WHERE type='view' AND name='{view.name}'"
+    run_view_test(url, metadata, view, query)
+
+
+@skip_if_not_mysql_uri
+def test_mysql_create_view(database_name, mysql_url, view):
+    metadata = MetaData()
+    make_table(metadata)  # table from which the view will select
+    url = replace_database_in_url(mysql_url, database_name)
+    query = f"SELECT 1 FROM information_schema.views WHERE table_name = '{view.name}'"
+    create_database(mysql_url, database_name)
+    run_view_test(url, metadata, view, query)
+    drop_database(mysql_url, database_name)
+
+
+def make_table(metadata):
+    users = Table('testfoo', metadata,
+        Column('id', Integer, primary_key=True),
+        Column('foo', Integer),
+        Column('bar', Integer)
+    )
+    return users
+
+
+def run_view_test(url, metadata, view, query):
+    with sqlalchemy_engine(url) as engine:
+        with engine.connect() as conn:
+            metadata.create_all(conn)  # create table in database
+            conn.execute(CreateView(view.name, view.__view__))  # create view in database
+            result = conn.execute(query).fetchall()
+            assert len(result) == 1  # assert that view exists in database
diff --git a/test/unit/tool_util/test_parsing.py b/test/unit/tool_util/test_parsing.py
index a34dda05166..e134657903a 100644
--- a/test/unit/tool_util/test_parsing.py
+++ b/test/unit/tool_util/test_parsing.py
@@ -393,7 +393,7 @@ class XmlLoaderTestCase(BaseLoaderTestCase):
         assert '@' not in command
 
     def test_recursive_token(self):
-        with self.assertRaises(Exception):
+        with self.assertRaisesRegex(Exception, "^Token '@NESTED_TOKEN@' cannot contain itself$"):
             self._get_tool_source(source_contents=TOOL_WITH_RECURSIVE_TOKEN)
 
     def test_creator(self):
diff --git a/test/unit/tool_util/test_tool_linters.py b/test/unit/tool_util/test_tool_linters.py
index 95159311608..16e64a4b000 100644
--- a/test/unit/tool_util/test_tool_linters.py
+++ b/test/unit/tool_util/test_tool_linters.py
@@ -36,14 +36,28 @@ RADIO_SELECT_INCOMPATIBILITIES = """
 </tool>
 """
 
+SELECT_DUPLICATED_OPTIONS = """
+<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
+    <description>The BWA Mapper</description>
+    <version_command interpreter="python">bwa.py --version</version_command>
+    <inputs>
+        <param name="select" type="select" optional="true" multiple="true">
+            <option value="v">x</option>
+            <option value="v">x</option>
+        </param>
+    </inputs>
+</tool>
+"""
+
 TESTS = [
     (NO_SECTIONS_XML, inputs.lint_inputs, lambda x: 'Found no input parameters.' in x.warn_messages),
-    (NO_WHEN_IN_CONDITIONAL_XML, inputs.lint_inputs, lambda x: 'No <when /> block found for select option \'none\' inside conditional \'labels\'' in x.warn_messages),
+    (NO_WHEN_IN_CONDITIONAL_XML, inputs.lint_inputs, lambda x: "Conditional [labels] no <when /> block found for select option 'none'" in x.warn_messages),
     (RADIO_SELECT_INCOMPATIBILITIES, inputs.lint_inputs, lambda x: 'Select [radio_select] display="radio" is incompatible with optional="true"' in x.error_messages and 'Select [radio_select] display="radio" is incompatible with multiple="true"' in x.error_messages),
+    (SELECT_DUPLICATED_OPTIONS, inputs.lint_inputs, lambda x: 'Select [select] has multiple options with the same text content' in x.error_messages and 'Select [select] has multiple options with the same value' in x.error_messages),
 ]
 
 
-@pytest.mark.parametrize('tool_xml,lint_func,assert_func', TESTS, ids=['Lint no sections', 'lint no when', 'radio select incompatibilities'])
+@pytest.mark.parametrize('tool_xml,lint_func,assert_func', TESTS, ids=['Lint no sections', 'lint no when', 'radio select incompatibilities', 'select duplicated options'])
 def test_tool_xml(tool_xml, lint_func, assert_func):
     lint_ctx = LintContext('all')
     tree = etree.ElementTree(element=etree.fromstring(tool_xml))
diff --git a/test/unit/unittest_utils/galaxy_mock.py b/test/unit/unittest_utils/galaxy_mock.py
index 914077f063d..02e44efe61a 100644
--- a/test/unit/unittest_utils/galaxy_mock.py
+++ b/test/unit/unittest_utils/galaxy_mock.py
@@ -21,7 +21,7 @@ from galaxy.model import mapping, tags
 from galaxy.model.base import SharedModelMapping
 from galaxy.model.mapping import GalaxyModelMapping
 from galaxy.security import idencoding
-from galaxy.structured_app import BasicApp, StructuredApp
+from galaxy.structured_app import BasicApp, MinimalManagerApp, StructuredApp
 from galaxy.tool_util.deps.containers import NullContainerFinder
 from galaxy.util import StructuredExecutionTimer
 from galaxy.util.bunch import Bunch
@@ -67,6 +67,7 @@ class MockApp(di.Container):
     def __init__(self, config=None, **kwargs):
         super().__init__()
         self[BasicApp] = self
+        self[MinimalManagerApp] = self
         self[StructuredApp] = self
         self.config = config or MockAppConfig(**kwargs)
         self.security = self.config.security
@@ -139,6 +140,7 @@ class MockAppConfig(Bunch):
         self.security = idencoding.IdEncodingHelper(id_secret='6e46ed6483a833c100e68cc3f1d0dd76')
         self.database_connection = kwargs.get('database_connection', "sqlite:///:memory:")
         self.use_remote_user = kwargs.get('use_remote_user', False)
+        self.enable_celery_tasks = False
         self.data_dir = os.path.join(root, 'database')
         self.file_path = os.path.join(self.data_dir, 'files')
         self.jobs_directory = os.path.join(self.data_dir, 'jobs_directory')
@@ -166,6 +168,7 @@ class MockAppConfig(Bunch):
         self.password_expiration_period = 0
 
         self.umask = 0o77
+        self.flush_per_n_datasets = 0
 
         # Compliance related config
         self.redact_email_in_job_name = False
diff --git a/test/unit/util/test_bool_expressions.py b/test/unit/util/test_bool_expressions.py
new file mode 100644
index 00000000000..71fa13cf366
--- /dev/null
+++ b/test/unit/util/test_bool_expressions.py
@@ -0,0 +1,76 @@
+import pytest
+
+from galaxy.util.bool_expressions import (
+    BooleanExpressionEvaluator,
+    DEFAULT_TOKEN_FORMAT,
+    TokenContainedEvaluator,
+)
+
+# Defines the allowed characters that form a valid token.
+# Tokens that don't match this format will raise a ParseException
+TOKEN_FORMAT = DEFAULT_TOKEN_FORMAT
+
+# The set of tokens that will be evaluated to True using the TokenContainedEvaluator the rest
+# of the *valid tokens* (those that match the TOKEN_FORMAT) will be evaluated to False.
+TOKENS_THAT_ARE_TRUE = {"T1", "token_2"}
+
+VALID_EXPRESSIONS_TESTS = [
+    ("T1", True),
+    ("token_2", True),
+    ("T3", False),
+    ("valid_token", False),
+    ("not T3", True),
+    ("NOT token_2", False),
+    ("T1 and not T3", True),
+    ("NOT T1 AND token_2", False),
+    ("not T3 or (T3 AND token_2)", True),
+    ("T1 and (T3 OR token_2)", True),
+    ("(T3 OR T1) and not (T3 OR valid_token)", True),
+]
+
+INVALID_EXPRESSIONS_TESTS = [
+    "",
+    "23 45",
+    "'some quoted str' and not T1",
+    "invalid expression",
+    "T1 and and T2",
+    "T1 not and T3",
+    "(T1 and T3",
+    "T1 or T3)",
+    "T1 and or T2",
+]
+
+
+@pytest.fixture(scope='module')
+def contained_evaluator() -> BooleanExpressionEvaluator:
+    """Boolean expression evaluator using the TokenContainedEvaluator.
+
+    All the tokens in TOKENS_THAT_ARE_TRUE will be evaluated to True and
+    any other token to False."""
+    token_evaluator = TokenContainedEvaluator(TOKENS_THAT_ARE_TRUE)
+    evaluator = BooleanExpressionEvaluator(token_evaluator, TOKEN_FORMAT)
+    return evaluator
+
+
+@pytest.mark.parametrize('expr, expected', VALID_EXPRESSIONS_TESTS)
+def test_expression_evaluates_as_expected(expr: str, expected: bool, contained_evaluator: BooleanExpressionEvaluator):
+    actual = contained_evaluator.evaluate_expression(expr)
+    assert actual == expected
+
+
+@pytest.mark.parametrize('expr', INVALID_EXPRESSIONS_TESTS)
+def test_invalid_expression_raises_exception(expr: str, contained_evaluator: BooleanExpressionEvaluator):
+    with pytest.raises(Exception):
+        contained_evaluator.evaluate_expression(expr)
+
+
+@pytest.mark.parametrize('expr, _', VALID_EXPRESSIONS_TESTS)
+def test_is_valid_expression_return_true_when_valid(expr: str, _: bool):
+    result = BooleanExpressionEvaluator.is_valid_expression(expr)
+    assert result is True
+
+
+@pytest.mark.parametrize('expr', INVALID_EXPRESSIONS_TESTS)
+def test_is_valid_expression_return_false_when_invalid(expr: str):
+    result = BooleanExpressionEvaluator.is_valid_expression(expr)
+    assert result is False
diff --git a/test/unit/util/test_compression_util.py b/test/unit/util/test_compression_util.py
index 2f8e6398f9f..59cf35aa263 100644
--- a/test/unit/util/test_compression_util.py
+++ b/test/unit/util/test_compression_util.py
@@ -39,7 +39,7 @@ class CompressionUtilTestCase(unittest.TestCase):
             if expected_to_be_safe:
                 CompressedFile(path).extract(temp_dir)
             else:
-                with self.assertRaises(Exception):
+                with self.assertRaisesRegex(Exception, "is blocked"):
                     CompressedFile(path).extract(temp_dir)
         finally:
             shutil.rmtree(temp_dir, ignore_errors=True)
diff --git a/tools/interactive/interactivetool_simtext_app.xml b/tools/interactive/interactivetool_simtext_app.xml
new file mode 100644
index 00000000000..ecadbbb9100
--- /dev/null
+++ b/tools/interactive/interactivetool_simtext_app.xml
@@ -0,0 +1,67 @@
+<tool id="interactive_tool_simtext_app" name="SimText" tool_type="interactive" version="0.0.2" license="MIT">
+    <description>Interactive shiny app to explore SimText output data</description>
+    <requirements>
+        <container type="docker">dlalgroup/simtext:2.0</container>
+    </requirements>
+    <entry_points>
+        <entry_point name="SimText App" requires_domain="true">
+            <port>8888</port>
+        </entry_point>
+    </entry_points>
+    <command><![CDATA[
+    Rscript 
+      '${__tool_directory__}/simtext_app.R'
+      --input '$input'
+      --matrix '$matrix'
+      --host '0.0.0.0'
+      --port '8888'
+      ]]>
+    </command>
+    <inputs>
+        <param argument="--input" label="Input file" name="input" type="data" format="tabular"/>
+        <param argument="--matrix" label="Matrix file" name="matrix" type="data" format="tabular"/>
+    </inputs>
+    <outputs>
+      <data format="tabular" name="output" />
+    </outputs>
+    <tests><!-- cannot test interactive tools yet
+        <test>
+          <param name="input" value="test_data" ftype="tabular"/>
+          <param name="matrix" value="text_to_wordmatrix_output"/>
+        </test>-->
+    </tests>
+    <help><![CDATA[
+
+**What it does**
+    
+The tool enables the exploration of data generated by ‘text_to_wordmatrix’ or ‘pmids_to_pubtator_matrix’ tools in a Shiny local instance.
+The following features can be generated: 1) word clouds for each initial search query, 2) dimension reduction and hierarchical clustering of
+binary matrices, and 3) tables with words and their frequency in the search queries.
+
+-----
+
+**How it works**
+
+
+- Input 1, a table with:
+        - A column with initial search queries starting with "ID\_" (e.g., "ID_gene" if initial search queries were genes).
+        - Column(s) with grouping factor(s) to compare pre-existing categories of the initial search queries with the grouping based on text. The column names should start with "GROUPING\_". If the column name is "GROUPING_disorder", "disorder" will be shown as a grouping variable in the app.
+
+    | ID_gene     | GROUPING_disorder  
+    | SCN1A       | epilepsy           
+    | ANKRD11     | autism             
+
+
+- Input 2:
+        - The output of 'text_to_wordmatrix' or 'pmids_to_pubtator_matrix' tools, or a binary matrix.
+
+    | scn8a       | neuro       | patient     | spectrum    | brain       | grin2a      
+    | 1           | 1           | 1           | 0           | 1           | 1           
+    | 0           | 1           | 0           | 1           | 1           | 0           
+
+
+   ]]></help>
+    <citations>
+        <citation type="doi">10.1101/2020.07.06.190629</citation>
+    </citations>
+</tool>
diff --git a/tools/interactive/simtext_app.R b/tools/interactive/simtext_app.R
new file mode 100644
index 00000000000..ee741489ea0
--- /dev/null
+++ b/tools/interactive/simtext_app.R
@@ -0,0 +1,591 @@
+#!/usr/bin/env Rscript
+### SimText App ###
+#
+#The tool enables the exploration of data generated by text_to_wordmatrix or pmids_to_pubtator_matrix in a locally run ShinyApp.
+#Features are word clouds for each initial search query, dimension reduction and hierarchical clustering of the binary matrix,
+#and a table with words and their frequency among the search queries.
+#
+#Input:
+#
+#   1)	Input 1:
+#   Tab-delimited table with
+# - column with search queries starting with "ID_", e.g. "ID_gene" if initial search queries were genes
+# - column(s) with grouping factor(s) to compare pre-existing categories of the initial search queries with the grouping based on text.
+#  The column names should start with "GROUPING_". If the column name is "GROUPING_disorder",
+#  "disorder" will be shown as a grouping variable in the app.
+#  2)	Input 2:
+#   Output of text_to_wordmatrix or pmids_to_pubtator_matrix, or binary matrix.
+#
+# optional arguments:
+# -h, --help                    show help message
+# -i INPUT, --input INPUT       input file name. add path if file is not in working directory
+# -m MATRIX, --matrix MATRIX    matrix file name. add path if file is not in working directory
+# -p PORT, --port PORT          specify port, otherwise randomly selected
+#
+#Output:
+#Shiny app with word clouds, dimensionality reduction plot, dendrogram of
+#hierarchical clustering and table with words and their frequency among the entities.
+#
+#Packages
+if (!require("shiny") & "--install_packages" %in% commandArgs()) {
+  install.packages("shiny", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("plotly")  & "--install_packages" %in% commandArgs()) {
+  install.packages("plotly", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("DT")  & "--install_packages" %in% commandArgs()) {
+  install.packages("DT", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("shinycssloaders")  & "--install_packages" %in% commandArgs()) {
+  install.packages("shinycssloaders", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("shinythemes") & "--install_packages" %in% commandArgs()) {
+  install.packages("shinythemes", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("tableHTML") & "--install_packages" %in% commandArgs()) {
+  install.packages("tableHTML", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("argparse") & "--install_packages" %in% commandArgs()) {
+  install.packages("argparse", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("PubMedWordcloud") & "--install_packages" %in% commandArgs()) {
+  install.packages("PubMedWordcloud", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("ggplot2") & "--install_packages" %in% commandArgs()) {
+  install.packages("ggplot2", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("stringr") & "--install_packages" %in% commandArgs()) {
+  install.packages("stringr", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("tidyr") & "--install_packages" %in% commandArgs()) {
+  install.packages("tidyr", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("magrittr") & "--install_packages" %in% commandArgs()) {
+  install.packages("magrittr", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("plyr") & "--install_packages" %in% commandArgs()) {
+  install.packages("plyr", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("ggpubr") & "--install_packages" %in% commandArgs()) {
+  install.packages("ggpubr", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("rafalib") & "--install_packages" %in% commandArgs()) {
+  install.packages("rafalib", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("RColorBrewer") & "--install_packages" %in% commandArgs()) {
+  install.packages("RColorBrewer", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("dendextend") & "--install_packages" %in% commandArgs()) {
+  install.packages("dendextend", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("Rtsne") & "--install_packages" %in% commandArgs()) {
+  install.packages("Rtsne", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("umap") & "--install_packages" %in% commandArgs()) {
+  install.packages("umap", repo = "http://cran.rstudio.com/")
+}
+
+if (!require("mclust") & "--install_packages" %in% commandArgs()) {
+  install.packages("mclust", repo = "http://cran.rstudio.com/")
+}
+
+suppressPackageStartupMessages(library("shiny"))
+suppressPackageStartupMessages(library("plotly"))
+suppressPackageStartupMessages(library("DT"))
+suppressPackageStartupMessages(library("shinycssloaders"))
+suppressPackageStartupMessages(library("shinythemes"))
+suppressPackageStartupMessages(library("tableHTML"))
+suppressPackageStartupMessages(library("argparse"))
+suppressPackageStartupMessages(library("PubMedWordcloud"))
+suppressPackageStartupMessages(library("ggplot2"))
+suppressPackageStartupMessages(library("stringr"))
+suppressPackageStartupMessages(library("tidyr"))
+suppressPackageStartupMessages(library("magrittr"))
+suppressPackageStartupMessages(library("plyr"))
+suppressPackageStartupMessages(library("ggpubr"))
+suppressPackageStartupMessages(library("rafalib"))
+suppressPackageStartupMessages(library("RColorBrewer"))
+suppressPackageStartupMessages(library("dendextend"))
+suppressPackageStartupMessages(library("Rtsne"))
+suppressPackageStartupMessages(library("umap"))
+suppressPackageStartupMessages(library("mclust"))
+
+#command arguments
+parser <- ArgumentParser()
+parser$add_argument("-i", "--input",
+                    help = "input file name. add path if file is not in working directory")
+parser$add_argument("-m", "--matrix", default = NULL,
+                    help = "matrix file name. add path if file is not in working directory")
+parser$add_argument("--host", default = NULL,
+                    help = "Specify host")
+parser$add_argument("-p", "--port", type = "integer", default = NULL,
+                    help = "Specify port, otherwise randomly select")
+parser$add_argument("--install_packages", action = "store_true", default = FALSE,
+                    help = "If you want to auto install missing required packages.")
+args <- parser$parse_args()
+
+# Set host
+if (!is.null(args$host))  {
+  options(shiny.host = args$host)
+}
+
+# Set port
+if (!is.null(args$port)) {
+  options(shiny.port = args$port)
+}
+
+#load data
+data <- read.delim(args$input, stringsAsFactors = FALSE)
+index_grouping <- grep("GROUPING_", names(data))
+names(data)[index_grouping] <- sub(".*_", "", names(data)[index_grouping])
+colindex_id <- grep("^ID_", names(data))
+
+matrix <- read.delim(args$matrix,
+                     check.names = FALSE,
+                     header = TRUE,
+                     sep = "\t")
+matrix <- (as.matrix(matrix) > 0) * 1 #transform matrix to binary matrix
+
+##### UI ######
+ui <- shinyUI(fluidPage(
+  navbarPage(theme = shinytheme("flatly"),
+             id = "inTabset",
+             selected = "panel1",
+             title = "SimText",
+             tabPanel("Home",
+                      value = "panel1",
+                      tabPanel("Results",
+                               value = "panel1",
+                               fluidRow(width = 12,
+                                        offset = 0,
+                                        column(width = 4,  style = "padding-right: 0px",
+                                               wellPanel(h5(strong("ID of interest")),
+                                                         style = "background-color:white;
+                            border-bottom: 2px solid #EEEEEE;
+                            border-top-color: white;
+                            border-right-color: white;
+                            border-left-color: white;
+                            box-shadow: 0px 0px 0px white;
+                            padding:3px;
+                            width: 100%"),
+                                               selectInput("id_interest", "Select ID:", paste0(data[[colindex_id]], " (",
+                                                                                               seq(1, length(data[[colindex_id]])),
+                                                                                               ")"))),
+                                        column(width = 3,  style = "padding-right: 0px",
+                                               wellPanel(h5(strong("Color settings")),
+                                                         style = "background-color:white;
+                            border-bottom: 2px solid #EEEEEE;
+                            border-top-color: white;
+                            border-right-color: white;
+                            border-left-color: white;
+                            box-shadow: 0px 0px 0px white;
+                            padding:3px;
+                            width: 100%"),
+                                               radioButtons("colour", "Color by:",
+                                                            c("Grouping variable", "Individual word")),
+                                               selectInput("colour_select", "Select:",
+                                                           choices = c(names(data)[index_grouping])))
+                               ),
+                               fluidRow(width = 12, offset = 0,
+                                        column(width = 4, #style = "height:650px;",
+                                               wellPanel(textOutput("id_text"),
+                                                         style = "background-color: #333333;
+                            color: white;
+                            border-top-color: #333333;
+                            border-left-color: #333333;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-bottom: 0px;
+                            padding:5px"),
+                                               wellPanel(
+                                                 fluidRow(
+                                                   column(width = 4,
+                                                          numericInput("fontsize", "Font size:",
+                                                                       value = 7, min = 1, max = 50)),
+                                                   column(width = 4,
+                                                          numericInput("nword", "Word number:",
+                                                                       value = 50, min = 1, max = 100)),
+                                                   column(width = 12,
+                                                          withSpinner(plotOutput("wordcloud_plot",
+                                                                                 height = "325px"))),
+                                                   column(width = 12,
+                                                          downloadLink("download_wordcloud", "Download"))),
+                                                 style = "background-color: #ffffff;
+                            border-bottom-color: #333333;
+                            border-left-color: #333333;
+                            height: 470px;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-top: 0px"),
+                                               wellPanel(textOutput("table"),
+                                                         style = "background-color: #333333;
+                            color: white;
+                            border-top-color: #333333;
+                            border-left-color: #333333;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-bottom: 0px;
+                            padding:5px"),
+                                               wellPanel(withSpinner(DT::dataTableOutput("datatable",
+                                                                                         height = "150px")),
+                                                         style = "background-color: #ffffff;
+                            border-bottom-color: #333333;
+                            border-left-color: #333333;
+                            border-right-color: #333333;
+                            height: 175px;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-top: 0px")
+                                        ),
+                                        column(width = 8, #style="padding:0px;",
+                                               wellPanel("Dimensionality reduction of matrix",
+                                                         style = "background-color: #333333;
+                            color: white;
+                            border-top-color: #333333;
+                            border-left-color: #333333;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-bottom: 0px;
+                            padding:5px"),
+                                               wellPanel(
+                                                 fluidRow(
+                                                   column(width = 2,
+                                                          radioButtons("method", "Method:",
+                                                                       choices = c("t-SNE", "UMAP"))),
+                                                   column(width = 2,
+                                                          numericInput("perplexity", "Perplexity:",
+                                                                       value = 2, min = 1, max = nrow(data) - 1)),
+                                                   column(width = 2,
+                                                          radioButtons("label", "Labels:",
+                                                                       choices = c("Index", "IDs"))),
+                                                   column(width = 2,
+                                                          numericInput("labelsize", "Label size:",
+                                                                       value = 12, min = 1, max = 30)),
+                                                   column(width = 8, style = "padding:0px;",
+                                                          withSpinner(plotlyOutput("tsne_plot",
+                                                                                   height = 550))),
+                                                   column(width = 4, style = "padding:0px;",
+                                                          withSpinner(plotOutput("tsne_plot_legend",
+                                                                                 height = 550))),
+                                                   column(width = 2,
+                                                          downloadLink("download_plot_data", label = "Download data"))),
+                                                 style = "background-color: white;
+                            border-bottom-color: #333333;
+                            border-left-color:  #333333;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-top: 0px"
+                                                 #height=575px
+                                               ))),
+                               fluidRow(column(width = 12,
+                                               wellPanel("Hierarchical clustering of matrix",
+                                                         style = "background-color: #333333;
+                            color: white;
+                            border-top-color: #333333;
+                            border-left-color: #333333;
+                            border-right-color: #333333;
+                            box-shadow: 3px 3px 3px #d8d8d8;
+                            margin-bottom: 0px;
+                            padding:5px")
+                                               ,
+                                               wellPanel(
+                                                 fluidRow(
+                                                   column(width = 2,
+                                                          radioButtons("hcmethod", "Method:",
+                                                                       choices = c("ward.D2", "average", "complete", "single"))),
+                                                   column(width = 2,
+                                                          numericInput("labelsize_hc", "Label size:",
+                                                                       value = 8, min = 1, max = 30))
+                                                 ),
+                                                 fluidRow(
+                                                   column(width = 9,
+                                                          withSpinner(plotOutput("hclust"))),
+                                                   column(width = 3,
+                                                          withSpinner(plotOutput("hclust_legend"))),
+                                                   column(width = 10,
+                                                          h4("Adjusted rand index")),
+                                                   column(width = 4,
+                                                          numericInput("kclusters", "Select number of clusters to compute adjusted rand index with:",
+                                                                       value = length(unique(as.character(data[, index_grouping[1]]))), min = 2, max = nrow(data))),
+                                                   column(width = 10,
+                                                          br(),
+                                                          uiOutput("hclust_ari"),
+                                                          HTML("<p><a href='https://link.springer.com/article/10.1007%2FBF01908075' target='_blank'>The adjusted rand index</a> compares two partitions of the same data and ranges from -1 to 1, with 0 showing random labeling and 1 showing perfect agreement between the two partitions.</p>"))
+                                                 ),
+                                                 style = "background-color: #ffffff;
+                                border-bottom-color: #333333;
+                                border-left-color: #333333;
+                                border-right-color: #333333;
+                                box-shadow: 3px 3px 3px #d8d8d8;
+                                margin-top: 0px")
+                                               ,
+                                               verbatimTextOutput("test")
+                               ))
+                      ))
+  )))
+
+###### SERVER ######
+server <- function(input, output, session) {
+
+##### Global #####
+  ids <- reactive({
+    paste0(data[[colindex_id]], " (", seq(1, length(data[[colindex_id]])), ")")
+  })
+  index_id <- reactive({
+    which(ids() == input$id_interest)
+  })
+
+  ##### Wordcloud plot and download#####
+  output$id_text <- renderText({
+    paste("Wordcloud of", data[[colindex_id]][index_id()])
+  })
+
+  output$wordcloud_plot <- renderPlot({
+    id_matrix <- matrix[index_id(), ]
+    id_matrix <- data.frame(word = as.character(names(id_matrix)),
+                            freq = id_matrix)
+    colnames(id_matrix) <- c("word", "freq")
+    id_matrix <- id_matrix[id_matrix$freq == 1, ]
+    plotWordCloud(id_matrix,
+                  max.words = min(nrow(id_matrix), input$nword),
+                  scale = c(input$fontsize / 10, input$fontsize / 10),
+                  colors = brewer.pal(8, "Greys")[4:8])
+  })
+
+  output$download_wordcloud <- downloadHandler(
+    filename <- function() {
+      paste0(paste0("Wordcloudof",
+                    data[[colindex_id]][index_id()]), ".pdf", sep = "")
+    },
+    content <- function(file) {
+      id_matrix <- matrix[index_id(), ]
+      id_matrix <- data.frame(word = names(id_matrix), freq = id_matrix)
+      colnames(id_matrix) <- c("word", "freq")
+      id_matrix <- id_matrix[id_matrix$freq == 1, ]
+      pdf(file)
+      plotWordCloud(id_matrix,
+                    max.words = min(nrow(id_matrix), input$nword),
+                    scale = c(input$fontsize / 10, input$fontsize / 10),
+                    colors = brewer.pal(8, "Greys")[4:8])
+      dev.off()
+    }
+  )
+
+  ##### Table #####
+  output$table  <-  renderText({
+    paste("Most occuring words among IDs")
+  })
+
+  output$datatable <- DT::renderDataTable({
+    colsum_data <- data.frame(word = colnames(matrix), freq = colSums(matrix))
+    colsum_data <- colsum_data[order(colsum_data$freq, decreasing = T), ]
+    colnames(colsum_data) <- c("Word", paste0("IDs (total n=", nrow(matrix), ")"))
+    DT::datatable(colsum_data,
+                  extensions = c("Buttons"),
+                  rownames = F,
+                  fillContainer = T,
+                  escape = FALSE,
+                  options = list(dom = "t",
+                                 scrollY = min(nrow(colsum_data), 500),
+                                 scrollX = TRUE,
+                                 scroller = TRUE,
+                                 autoWidth = TRUE,
+                                 pageLength = nrow(colsum_data),
+                                 columnDefs = list(
+                                   list(className = "dt-center", targets = "_all"),
+                                   list(width = "50%", targets = "_all")))
+    )
+  })
+
+  ##### colour #####
+  outvar <- reactive({
+    if (input$colour == "Grouping variable") {
+      return(names(data)[index_grouping])
+    } else {
+      return(colnames(matrix))
+    }
+  })
+
+  observe({
+    updateSelectInput(session, "colour_select", choices = outvar())})
+
+  colour_choice <- reactive({
+    if (input$colour == "Grouping variable") {
+      return(as.factor(data[, input$colour_select]))
+    } else {
+      matrix <- as.data.frame(matrix)
+      colour_byword <- matrix[[input$colour_select]]
+      colour_byword <- ifelse(colour_byword > 0,
+                              "Selected word associated with ID",
+                              "Selected word not associated with ID")
+      return(as.factor(colour_byword))
+    }
+  })
+
+  color_palette <- reactive({
+    palette <- c("#A6CEE3", "#1F78B4", "#B2DF8A", "#33A02C", "#FB9A99",
+                 "#E31A1C", "#FDBF6F", "#FF7F00", "#CAB2D6", "#6A3D9A",
+                 "#00AFBB", "#E7B800", "#FC4E07", "#999999", "#E69F00",
+                 "#56B4E9", "#009E73", "#F0E442", "#0072B2", "#D55E00")
+    return(palette[seq(length(levels(colour_choice())))])
+  })
+
+  ##### Dimension reduction plot and download #####
+  data_dimred <- reactive({
+    if (input$method == "t-SNE") {
+      tsne_result <- Rtsne(matrix, perplexity = input$perplexity, check_duplicates = F)
+      data["X_Coord"] <- tsne_result$Y[, 1]
+      data["Y_Coord"] <- tsne_result$Y[, 2]
+      return(data)
+    } else if (input$method == "UMAP") {
+      umap_result <- umap(matrix)
+      data["X_Coord"] <- umap_result$layout[, 1]
+      data["Y_Coord"] <- umap_result$layout[, 2]
+      return(data)
+    }
+  })
+
+  output$tsne_plot <- renderPlotly({
+    if (input$label == "Index") {
+      labeling <- as.character(seq(1, nrow(data)))
+    } else if (input$label == "IDs") {
+      labeling <- as.character(data[[colindex_id]])
+    }
+    p <- plot_ly(colors = color_palette()) %>%
+      add_trace(type = "scatter",
+                mode = "markers",
+                x = data_dimred()$X_Coord[index_id()],
+                y = data_dimred()$Y_Coord[index_id()],
+                opacity = 0.15,
+                marker = list(
+                  color = "grey",
+                  size = 80)) %>%
+      add_trace(x = data_dimred()$X_Coord,
+                y = data_dimred()$Y_Coord,
+                type = "scatter",
+                mode = "text",
+                text = labeling,
+                textfont = list(size = input$labelsize),
+                color = factor(colour_choice())) %>%
+      add_trace(x = data_dimred()$X_Coord,
+                y = data_dimred()$Y_Coord,
+                type = "scatter",
+                mode = "markers",
+                opacity = 0,
+                text = paste0("ID: ", data[[colindex_id]], "\n",
+                              "Index: ", seq(1, nrow(data)), "\n",
+                              "Grouping: ", paste(data[, index_grouping])),
+                hoverinfo = "text",
+                color = factor(colour_choice())) %>%
+      layout(showlegend = FALSE,
+             yaxis = list(title = "",
+                          zeroline = FALSE,
+                          linecolor = toRGB("black"),
+                          linewidth = 1,
+                          showticklabels = FALSE,
+                          showgrid = FALSE),
+             xaxis = list(title = "",
+                          zeroline = FALSE,
+                          linecolor = toRGB("black"),
+                          linewidth = 1,
+                          showticklabels = FALSE,
+                          showgrid = FALSE),
+             autosize = T) %>%
+      config(modeBarButtonsToRemove = c("zoomIn2d", "zoomOut2d",
+                                        "hoverClosestGeo", "hoverClosestGl2d",
+                                        "toImage", "hoverClosestCartesian",
+                                        "lasso2d", "select2d", "resetScale2d",
+                                        "hoverCompareCartesian",
+                                        "hoverClosestPie", "toggleSpikelines"),
+             displaylogo = FALSE) %>%
+      style(hoverinfo = "none", traces = c(1, 2))
+    p
+  })
+
+  #legend of plotly plot by ggplot
+  output$tsne_plot_legend <- renderPlot({
+    p <- ggplot(data, aes(x = 1, y = 1)) +
+      geom_text(aes(label = seq(1, nrow(data)), colour = factor(colour_choice())),
+                size = 3.5, fontface = "bold") +
+      theme_classic() +
+      scale_color_manual(values = color_palette()) +
+      theme(legend.title = element_blank()) +
+      theme(legend.position = "right") +
+      theme(legend.text = element_text(size = 9))
+    leg <- get_legend(p)
+    as_ggplot(leg)
+  })
+
+  output$download_plot_data <- downloadHandler(
+    filename <- function() {
+      paste0(input$method, "_coordinates.csv")
+    },
+    content <- function(file) {
+      write.csv(data_dimred(), file, row.names = F)
+    }
+  )
+
+  ##### Hierarchical clustering #######
+  output$hclust <- renderPlot({
+    set.seed(42)
+    clustering <- hclust(dist(matrix), method = input$hcmethod)
+    par(oma = c(3, 3, 3, 3))
+    palette(color_palette())
+    par(mar = rep(0, 4))
+    myplclust(clustering,
+              labels = paste(data[[colindex_id]]),
+              lab.col = as.fumeric(as.character(colour_choice()),
+                                   levels = sort(unique(as.character(colour_choice())))),
+              cex = as.numeric(input$labelsize_hc / 10),
+              main = "",
+              yaxt = "n",
+              ylab = "")
+  })
+
+  #legend
+  output$hclust_legend <- renderPlot({
+    p <- ggplot(data, aes(x = 1, y = 1)) +
+      geom_text(aes(label = seq(1, nrow(data)),
+                    colour = factor(colour_choice())),
+                fontface = "bold") +
+      theme_classic() +
+      scale_color_manual(values = color_palette()) +
+      theme(legend.title = element_blank()) +
+      theme(legend.position = "right") +
+      theme(legend.text = element_text(size = 9))
+    leg <- get_legend(p)
+    as_ggplot(leg)
+  })
+
+  output$hclust_ari <- renderUI({
+    #adjusted Rand index
+    clustering <- hclust(dist(matrix), method = input$hcmethod)
+    mc_ari <- adjustedRandIndex(as.character(data[, index_grouping[1]]), cutree(clustering, k = input$kclusters))
+    text1 <- paste("By dividing the data into", input$kclusters, "clusters and comparing the resulting partition with the initial grouping variable, the adjusted rand index equals")
+    text2 <- paste(round(mc_ari, 2), ".")
+    HTML(paste(text1, text2))
+  })
+  ##### Test field for development ######
+  #output$test <- renderPrint({
+  #})
+}
+
+###### APP ######
+shinyApp(ui, server)
diff --git a/tox.ini b/tox.ini
index 0c67927158b..cf7989ab335 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,6 +47,9 @@ commands = bash .ci/check_mako.sh
 [testenv:test_galaxy_packages]
 commands = bash packages/test.sh
 
+[testenv:test_galaxy_release]
+commands = bash test/release.sh
+
 [testenv:validate_test_tools]
 commands = bash .ci/validate_test_tools.sh